diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php
index 1cd5957f65..ef53341622 100644
--- a/src/applications/people/query/PhabricatorPeopleQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleQuery.php
@@ -75,7 +75,12 @@ final class PhabricatorPeopleQuery extends PhabricatorOffsetPagedQuery {
         mpull($users, 'getPHID'));
       $emails = mpull($emails, null, 'getUserPHID');
       foreach ($users as $user) {
-        $user->attachPrimaryEmail($emails[$user->getPHID()]);
+        // Fail gracefully if we have data integrity problems.
+        if (empty($emails[$user->getPHID()])) {
+          $user->attachPrimaryEmail(new PhabricatorUserEmail());
+        } else {
+          $user->attachPrimaryEmail($emails[$user->getPHID()]);
+        }
       }
     }