possible null pointer fix