If there's an exception in notice distribution, continue

diff --git a/classes/Notice.php b/classes/Notice.php
index 2c404e2550544a307c40c037f30514a00167842b..bab9a0dbfdf45f9cf11971dc66aa00c388bed879 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1031,9 +1031,15 @@ class Notice extends Managed_DataObject
             }
 
             foreach ($ni as $id => $source) {
-                $user = User::staticGet('id', $id);
-                if (empty($user) || $user->hasBlocked($profile) ||
-                    ($originalProfile && $user->hasBlocked($originalProfile))) {
+                try {
+                    $user = User::staticGet('id', $id);
+                    if (empty($user) ||
+                        $user->hasBlocked($profile) ||
+                        ($originalProfile && $user->hasBlocked($originalProfile))) {
+                        unset($ni[$id]);
+                    }
+                } catch (UserNoProfileException $e) {
+                    // User doesn't have a profile; invalid; skip them.
                     unset($ni[$id]);
                 }
             }