From 540d6efe88717b0da4a23b5069a3caaff5b3241a Mon Sep 17 00:00:00 2001
From: blackle <isabelle@blackle-mori.com>
Date: Wed, 5 Apr 2017 20:04:13 -0400
Subject: [PATCH] Catch more errors in process_follows so it doesn't fail

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

diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
index 7cf29fb53c58d8..d5a33cada3ccb9 100644
--- a/app/workers/import_worker.rb
+++ b/app/workers/import_worker.rb
@@ -46,7 +46,7 @@ def process_follows(import)
 
       begin
         FollowService.new.call(from_account, row[0])
-      rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
+      rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
         next
       end
     end