diff --git a/app/helpers/text_with_links_helper.rb b/app/helpers/text_with_links_helper.rb
index baff460a1..9144bdd6b 100644
--- a/app/helpers/text_with_links_helper.rb
+++ b/app/helpers/text_with_links_helper.rb
@@ -7,6 +7,7 @@ module TextWithLinksHelper
   end
 
   def safe_html_with_links(html)
+    return if html.nil?
     return html.html_safe unless html.html_safe?
     Rinku.auto_link(html, :all, 'target="_blank" rel="nofollow"').html_safe
   end