Fix issue where incomplete email address are sent as null