nullpointer fix