Fixed NullPointer on startup