small nullpointer fixed