1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index a18af8c69..2a0661fab 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -240,7 +240,7 @@ class PublicBody < ActiveRecord::Base
     # Return the short name if present, or else long name
     def short_or_long_name
         if self.short_name.nil? || self.short_name.empty?   # 'nil' can happen during construction
-            self.name
+            self.name.nil? ? "" : self.name
         else
             self.short_name
         end
@@ -547,6 +547,11 @@ class PublicBody < ActiveRecord::Base
         }
     end
 
+    after_save(:purge_in_cache)
+    def purge_in_cache
+        self.info_requests.each {|x| x.purge_in_cache}
+    end
+
 end