Nice job dealing with null and empty values