Corrected the NPE on startup.