Bugfix nullpointer ex