Altered location of NicObj null-checking