am 6683fa35: Merge change 5688 into donut

Merge commit '6683fa352a7ed5d2c02c227da1c7268640c19aa4'

* commit '6683fa352a7ed5d2c02c227da1c7268640c19aa4':
  Fixes #1949253. Prevents NPE on startup.