Removed unnecessary test for null