diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
index 5975c859acc..40a40dc2beb 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
@@ -705,6 +705,9 @@ sub NewProcessOnePerson ($$$$$$$$$$$$$) {
     # This routine should really get passed a userid
     # This rederives groups as a side effect
     my $user = Bugzilla::User->new_from_login($person);
+    if (!$user) { # person doesn't exist, probably changed email
+      return;
+    }
     my $userid = $user->id;
 
     $seen{$person} = 1;