2 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index bcab5959a0..c3a3d3e32e 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -99,6 +99,10 @@
       text-align: right;
     }
 
+    .line {
+      padding-left: 10px;
+    }
+
     .line:hover {
       background-color: #f6f6f6;
     }
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index 33194250b7..6d99d43fb8 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -95,7 +95,11 @@ module ActionView
           options[:class] = "#{dom_class(record, prefix)} #{options[:class]}".rstrip
           options[:id]    = dom_id(record, prefix)
 
-          content_tag(tag_name, capture(record, &block), options)
+          if block_given?
+            content_tag(tag_name, capture(record, &block), options)
+          else
+            content_tag(tag_name, "", options)
+          end
         end
     end
   end