null pointer fixes