Fix potential null pointers