fixed nullpointer issue