Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/exceptions.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/exceptions.py	(revision 6200)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/exceptions.py	(revision 6201)
@@ -22,40 +22,27 @@
 import grok
 import zope.errorview.browser
-from megrok.layout import Page
 from zope.interface.common.interfaces import IException
+from zope.errorview.http import SystemErrorViewMixin
 from zope.publisher.interfaces import INotFound
 from zope.security.interfaces import IUnauthorized
-from waeup.sirp.browser.layout import SiteLayout, WAeUPPage
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.browser.layout import WAeUPPage
 
 grok.templatedir('templates')
 
-class ExceptionLayout(SiteLayout):
-    """ The general site layout.
+class ExceptionView(grok.View, zope.errorview.browser.ExceptionView,
+                    SystemErrorViewMixin):
+    """Base class for rendering views for uncaught exceptions that occur during
+    the application run-time and are not otherwise rendered.
+
+    Backport from Grok 1.6.
+
+    XXX: This view is shared for all apps and objects in the ZODB root.
     """
     grok.context(IException)
-    grok.template('sitelayout')
+    grok.name('index.html')
+    grok.template('exception')
 
-
-#class ExceptionPage(WAeUPPage):
-#    grok.context(IException)
-#    grok.name('index.html')
-#    grok.template('exception')
-#
-#    title = u'System Error'
-#    pnav = 0
-#
-#    def update(self):
-#        # XXX: That's merely bullshit. We cannot trust to have anything
-#        # ready/setup if some arbitrary exception happens. Maybe we're
-#        # better off with views instead pages here?
-#        self.message = self.context.message
-#        self.args = self.context.args
-#        self.error_context = self.context
-#        if not IWAeUPObject.providedBy(self.context):
-#            self.context = self.context = getattr(
-#                self.context, '__parent__', self.context)
-#            self.context = self.context.context
-#        return
+    def update(self):
+        return zope.errorview.browser.ExceptionView.update(self)
 
 class UnauthorizedView(grok.View, zope.errorview.browser.UnauthorizedView):
@@ -79,4 +66,8 @@
 
 class NotFoundPage(WAeUPPage):
+    """A page rendered when an object cannot be found.
+
+    XXX: This page won't work for objects above a w.s.University.
+    """
     grok.context(INotFound)
     grok.name('index.html')
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/exception.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/exception.pt	(revision 6201)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/exception.pt	(revision 6201)
@@ -0,0 +1,9 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>System Error</title>
+  </head>
+  <body>
+    <h1>A system error occured</h1>
+    <div>We apologize for any inconveniences</div>
+  </body>
+</html>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/unauthorized.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/unauthorized.pt	(revision 6200)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/unauthorized.pt	(revision 6201)
@@ -1,3 +1,10 @@
-<div class="warning">
-  <b>You are not authorized to access this resource.</b>
-</div>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Not Authorized</title>
+  </head>
+  <body>
+    <div class="warning">
+      <b>You are not authorized to access this resource.</b>
+    </div>
+  </body>
+</html>
