null pointer fix