Another check for a null pointer. Re #6533.