From 4424fd81b81f51f99bc71fe26158ce74d5e3c2a4 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 16 May 2017 16:08:42 -0400
Subject: [PATCH] add a tiny bit of extra protection

---
 app/models/topic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 2b9643b3f83..703392c9fc5 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -700,7 +700,7 @@ SQL
         topic_user.destroy
         # we can not remove ourselves cause then we will end up adding
         # ourselves in add_small_action
-        removed_by = Discourse.system_user if user.id == removed_by.id
+        removed_by = Discourse.system_user if user.id == removed_by&.id
         add_small_action(removed_by, "removed_user", user.username)
         return true
       end