Merge change 5688 into donut

* changes:
  Fixes #1949253. Prevents NPE on startup.