bugfix: NPE in startup code