diff --git a/config/alfresco/templates/webscripts/status.ftl b/config/alfresco/templates/webscripts/status.ftl
index 120d7b4ab7..7fa345363d 100644
--- a/config/alfresco/templates/webscripts/status.ftl
+++ b/config/alfresco/templates/webscripts/status.ftl
@@ -21,13 +21,26 @@
      <tr><td><b>${status.code} Description:</b><td> ${status.codeDescription}
      <tr><td>&nbsp;
      <tr><td><b>Message:</b><td>${status.message!"<i>&lt;Not specified&gt;</i>"}
-     <tr><td><b>Exception:</b><td><#if status.exception?exists>${status.exception.class.name}<#if status.exception.message?exists> - ${status.exception.message}</#if></#if>
      <#if status.exception?exists>
-       <tr><td><td>&nbsp;
-       <#list status.exception.stackTrace as element>
-         <tr><td><td>${element}
-       </#list>  
+       <tr><td>&nbsp;     
+       <@recursestack status.exception/>
      </#if>
     </table>
   </body>
 </html>
+
+<#macro recursestack exception>
+   <#if exception.cause?exists>
+      <@recursestack exception=exception.cause/>
+   </#if>
+   <tr><td><b>Exception:</b><td>${exception.class.name}<#if exception.message?exists> - ${exception.message}</#if>
+   <tr><td><td>&nbsp;
+   <#if exception.cause?exists == false>
+      <#list exception.stackTrace as element>
+         <tr><td><td>${element}
+      </#list>  
+      <#else>
+         <tr><td><td>${exception.stackTrace[0]}
+      </#if>
+   <tr><td><td>&nbsp;
+</#macro>
diff --git a/config/alfresco/templates/webscripts/xml.status.ftl b/config/alfresco/templates/webscripts/xml.status.ftl
index a46bd2d735..d7328eeddc 100644
--- a/config/alfresco/templates/webscripts/xml.status.ftl
+++ b/config/alfresco/templates/webscripts/xml.status.ftl
@@ -9,9 +9,23 @@
   <exception><#if status.exception?exists>${status.exception.class.name}<#if status.exception.message?exists> - ${status.exception.message}</#if></#if></exception>
   <callstack>
   <#if status.exception?exists>
-   <#list status.exception.stackTrace as element>
-     ${element}
-   </#list>
+   <@recursestack status.exception/>
   </#if>
   </callstack>
-</response>
\ No newline at end of file
+</response>
+
+<#macro recursestack exception>
+   <#if exception.cause?exists>
+      <@recursestack exception=exception.cause/>
+   </#if>
+   <#if exception.cause?exists == false>
+      ${exception}
+      <#list exception.stackTrace as element>
+         ${element}
+      </#list>  
+      <#else>
+         ${exception}
+         ${exception.stackTrace[0]}
+      </#if>
+   <tr><td><td>&nbsp;
+</#macro>