diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index 4abb1a357..dc847de50 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -43,7 +43,7 @@ module ActionView
   end
 end
 
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
+ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
 
 require 'mail'
 
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 7cd823e6f..5ffc31f8a 100644
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -149,6 +149,7 @@ class QueriesControllerTest < ActionController::TestCase
     end
     assert_response :success
     assert_template 'new'
+    assert_select 'input[name=?]', 'query[name]'
   end
 
   def test_edit_global_public_query