Nullpointer fixed