Fix for r70871: need explicit check against null since current check also catches...