Fixed NullPointerException on startup