--- java/org/apache/catalina/valves/ErrorReportValve.java	(revision 1497999)
+++ java/org/apache/catalina/valves/ErrorReportValve.java	(working copy)
@@ -272,11 +272,12 @@ 
         trace.append(t.toString()).append('\n');
         StackTraceElement[] elements = t.getStackTrace();
         int pos = elements.length;
-        for (int i = 0; i < elements.length; i++) {
+        for (int i = elements.length - 1; i >= 0; i--) {
             if ((elements[i].getClassName().startsWith
                  ("org.apache.catalina.core.ApplicationFilterChain"))
                 && (elements[i].getMethodName().equals("internalDoFilter"))) {
                 pos = i;
+                break;
             }
         }
         for (int i = 0; i < pos; i++) {