Reverted null check