Merge branch 'master' into wdtk

2 files changed, 5 insertions, 1 deletions

diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 961fa3cbb..90e9395ae 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
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 025d72c8d..efe3d4d71 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,7 @@
+# Version 0.5.2
+
+This is a hotfix to fix occasional problems importing public body CSVs
+
 # Version 0.5.1
 
 ## Highlighted features