More checking on null pointers
p4#: 21052