Ensure we always return a string of some kind when asking for the short_or_long_name of a public body

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 11c6f6033..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