potential null pointer fix