fixed nullpointer exception
whatever