Bugfixes
Fixed startup nullpointerexception