Fix QA failures on tip (don't dereference through a NULL pointer).
Fix QA failures on tip (don't dereference through a NULL pointer).

ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss