Update codeguard.  Add checkNullAndThrow(...)