removed nullpointer