Fix NPE at boot

Resolves #3