From 9a2a6b476b0a815507ea8896d8004b112c54be0a Mon Sep 17 00:00:00 2001
From: Eugen <eugen@zeonfederated.com>
Date: Sun, 22 Jan 2017 21:50:17 +0100
Subject: [PATCH] Mitigate inconsistent notifications

---
 app/models/notification.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index c0b5c45a8c..b7e8c9e719 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -39,9 +39,9 @@ class Notification < ApplicationRecord
   def target_status
     case type
     when :reblog
-      activity.reblog
+      activity&.reblog
     when :favourite, :mention
-      activity.status
+      activity&.status
     end
   end