Fixed NPE on launch