1 files changed, 7 insertions, 2 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 7319a62ea..aa6ea278c 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -167,8 +167,13 @@ class NoticeListItem extends Widget
     {
         parent::__construct($out);
         if (!empty($notice->repeat_of)) {
-            $this->notice = Notice::staticGet('id', $notice->repeat_of);
-            $this->repeat = $notice;
+            $original = Notice::staticGet('id', $notice->repeat_of);
+            if (empty($original)) { // could have been deleted
+                $this->notice = $notice;
+            } else {
+                $this->notice = $original;
+                $this->repeat = $notice;
+            }
         } else {
             $this->notice  = $notice;
         }