Index: src/webapp/lenya/resources/i18n/cmsui.xml
===================================================================
--- src/webapp/lenya/resources/i18n/cmsui.xml	(revision 374056)
+++ src/webapp/lenya/resources/i18n/cmsui.xml	(working copy)
@@ -378,5 +378,10 @@
   <message key="error-document-existance">The requested document {0} with document-id {1} does not exist.</message>
   <message key="error-generic">An error occured.</message>
   <message key="error-404">404: Page not found</message>
+  <message key="error-recovery">
+    You can continue your work by clicking on the following link. However, your last action is probably lost.<br />
+    Please consider informing your site administrator of the problem. You should probably save this page to help find the problem.
+  </message>
+  <message key="error-recovery-link">back to the authoring interface</message>
 
 </catalogue>
Index: src/webapp/lenya/xslt/exception/generic.xsl
===================================================================
--- src/webapp/lenya/xslt/exception/generic.xsl	(revision 374056)
+++ src/webapp/lenya/xslt/exception/generic.xsl	(working copy)
@@ -67,13 +67,19 @@
 	<div class="lenya-box">
 	  <div class="lenya-box-title"><i18n:text i18n:key="error-generic" /></div>
 	  <div class="lenya-box-body">
+            <p>
+               <i18n:text i18n:key="error-recovery"/>
+               <xsl:text> [</xsl:text><a href="{$documentid}"><i18n:text i18n:key="error-recovery-link"/></a><xsl:text>]</xsl:text>
+            </p>
 	    <p>
           <xsl:value-of select="error:message"/>
 	    </p>
 	    <p>
           <xsl:value-of select="error:description"/>
 	    </p>
+            <p>
         <xsl:apply-templates select="error:extra"/>
+            </p>
 	  </div>
 	</div>
       </page:body>