Added a check for null values, they need to be set to IS null, not equals null