fix startup NPE
Merge pull request #1239 from cascheberg/fix

Fix NPE startup crash