From: Nolan Lawson <nolan@nolanlawson.com>
Date: Tue, 3 Apr 2018 11:08:11 +0000 (-0700)
Subject: Fix nil account issue in ProcessAccountService (#7019)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6ff3b3e4db09c8ddf2faad6710e4a25f988e762d;p=mastodon.git

Fix nil account issue in ProcessAccountService (#7019)
---

diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index cf8462821..21c2fc57a 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -28,7 +28,7 @@ class ActivityPub::ProcessAccountService < BaseService
 
     after_protocol_change! if protocol_changed?
     after_key_change! if key_changed?
-    check_featured_collection! if @account.featured_collection_url.present?
+    check_featured_collection! if @account&.featured_collection_url&.present?
 
     @account
   rescue Oj::ParseError