Removed double null check