add a missing nullpointer check