Fixed NPE on startup