BUG Handle missing email address