Issue #27570: Merge null pointer fixes from 3.5