1 files changed, 21 insertions, 14 deletions
diff --git a/app/views/general/exception_caught.rhtml b/app/views/general/exception_caught.rhtml
index ca36b592b..b266b53a1 100644
--- a/app/views/general/exception_caught.rhtml
+++ b/app/views/general/exception_caught.rhtml
@@ -1,17 +1,24 @@
-<h1><%= _("Sorry, we couldn't find that page") %></h1>
+<div id="error-page">
+ <% if @status == 404 %>
+  <h1><%= _("Sorry, we couldn't find that page") %></h1>
 
-<p><%= _("The page either doesn't exist, or is broken. Things you can try now:")%></p>
+  <p><%= _("The page doesn't exist. Things you can try now:")%></p>
 
-<ul>
-<li><%= _("Check for mistakes if you typed or copied the address.")%></li>
-<li><%= _("Search the site to find what you were looking for.")%>
-    <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %>
-           <%= text_field_tag 'query', params[:query], { :size => 30 } %>
-           <%= submit_tag _("Search") %>
-    <% end %>
-</li>
-<li><%= _('<a href="%s">Contact us</a> to tell us about the problem</li>') % [help_contact_path] %>
-<li><%= _('Go to our <a href="%s">front page</a></li>') % ["/"] %>
-</ul>
+  <ul>
+  <li><%= _("Check for mistakes if you typed or copied the address.")%></li>
+  <li><%= _("Search the site to find what you were looking for.")%>
+      <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %>
+             <%= text_field_tag 'query', params[:query], { :size => 30 } %>
+             <%= submit_tag _("Search") %>
+      <% end %>
+  </li>
+  </ul>  
+ <% else %>
+  <h1><%= _("Sorry, there was a problem processing this page") %></h1>
+  <p><%= _('You have found a bug.  Please <a href="{{contact_url}}">contact us</a> to tell us about the problem', :contact_url => help_contact_path) %></p>
 
-<p id="error_technical_details"><%= _("<strong>Technical details:</strong>")%> <%=@exception_class ? @exception_class : _("Unknown")%></p>
+ <% end %>
+  <h2><%= _('Technical details') %></h2>
+  <p><strong><%=@exception_class ? @exception_class : _("Unknown")%></strong></p>
+  <p><strong><%=@exception_message %></strong></p>
+</div>