diff --git a/app/views/blocks/raw_html.html.erb b/app/views/blocks/raw_html.html.erb
index 2a1db22..64c1ba1 100644
--- a/app/views/blocks/raw_html.html.erb
+++ b/app/views/blocks/raw_html.html.erb
@@ -1,3 +1,3 @@
 <%= block_title(block.title, block.subtitle) %>
 
-<%= block.html.html_safe %>
+<%= (block.html || '').html_safe %>
diff --git a/test/unit/raw_html_block_test.rb b/test/unit/raw_html_block_test.rb
index 600317d..1ed05c2 100644
--- a/test/unit/raw_html_block_test.rb
+++ b/test/unit/raw_html_block_test.rb
@@ -40,4 +40,11 @@ class RawHTMLBlockTest < ActiveSupport::TestCase
     assert block.editable?(user)
   end
 
+  should 'not raise if there is no html defined' do
+    block = RawHTMLBlock.new(:html => nil)
+    assert_nothing_raised do
+      render_block_content(block)
+    end
+  end
+
 end
--
libgit2 0.21.2