Merge pull request #1585 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 5 insertions, 1 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index 3178a0f9c..ab3cac0d6 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -299,7 +299,11 @@ class Account < ApplicationRecord
   end
 
   def fields
-    (self[:fields] || []).map { |f| Field.new(self, f) }
+    (self[:fields] || []).map do |f|
+      Field.new(self, f)
+    rescue
+      nil
+    end.compact
   end
 
   def fields_attributes=(attributes)