(Hopefully) Fixed NullPointerException on launch