Fix NPE on startup fixes problem that arose after fixing issue #77