massive null checking enhancements chasing Bug 4775