Now handles nulls in address fields.