Adds a check for null values and skips