Removed unnecessary null check