Fix NPE on Startup