Bugfix nullpointer crash