if entity != player, THEN check if null; Fixes #7