Fix problem with missing email addresses.