diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -26,7 +26,7 @@
 import logging
 import traceback
 from collections import defaultdict
-from webob.exc import HTTPForbidden, HTTPBadRequest
+from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound
 
 from pylons import tmpl_context as c, url, request, response
 from pylons.i18n.translation import _
@@ -204,7 +204,7 @@ class ChangesetController(BaseRepoContro
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='error')
-            return redirect(url('changeset_home', repo_name=c.repo_name))
+            raise HTTPNotFound()
 
         c.changes = OrderedDict()
 
diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html
--- a/rhodecode/templates/errors/error_document.html
+++ b/rhodecode/templates/errors/error_document.html
@@ -33,16 +33,16 @@
 
     </head>
     <body>
-	    <div class="flash_msg">
-	        <% messages = h.flash.pop_messages() %>
-	        % if messages:
-	        <ul id="flash-messages">
-	            % for message in messages:
-	            <li class="${message.category}_msg">${message}</li>
-	            % endfor
-	        </ul>
-	        % endif
-	    </div>
+        <div class="flash_msg">
+            <% messages = h.flash.pop_messages() %>
+            % if messages:
+            <ul id="flash-messages">
+                % for message in messages:
+                <li class="${message.category}_msg">${message}</li>
+                % endfor
+            </ul>
+            % endif
+        </div>
         <div id="login">
             <div class="table">
                 <div id="main_div">