null pointer fix
null pointer fix