diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 0687be4698..70bf24c414 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed error handling of broken layouts #1115 [Michael Schubert]
+
 * Changed render_partial to take local assigns as the second parameter instead of an explicit object and then the assigns. So the API changes from:
 
     <%= render_partial "account", person, "rules" => regulations.rules %>
diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
index 9a331b9bf2..074d3a0bc0 100644
--- a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
@@ -1,6 +1,6 @@
 <h1>
   <%=h @exception.original_exception.class.to_s %> in
-  <%=h @request.parameters["controller"].capitalize %>#<%=h @request.parameters["action"] %>
+  <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
 </h1>
 
 <p>