Fix NPE on startup