Null check hardening