diff --git a/pmd/bin/build.xml b/pmd/bin/build.xml
index 50e18ebee2..9f62bf0482 100644
--- a/pmd/bin/build.xml
+++ b/pmd/bin/build.xml
@@ -159,11 +159,11 @@
 		<javacc target="src/net/sourceforge/pmd/ast/Java.jj" outputdirectory="src/net/sourceforge/pmd/ast" javacchome="${javacc-home.path}" />
 		<delete file="src/net/sourceforge/pmd/ast/Java.jj" />
 		<replace file="src/net/sourceforge/pmd/ast/JavaParserTokenManager.java" token="throw new Error" value="throw new RuntimeException" />
-		<replace file="src/net/sourceforge/pmd/ast/JavaParser.java" token="(Error)" value="(RuntimeException)" />
 		<replace file="src/net/sourceforge/pmd/ast/JavaParser.java" token="throw new Error" value="throw new RuntimeException" />
 		<replace file="src/net/sourceforge/pmd/ast/JavaCharStream.java" token="throw new Error" value="throw new RuntimeException" />
 		<replace file="src/net/sourceforge/pmd/ast/ParseException.java" token="throw new Error" value="throw new RuntimeException" />
-		<replace file="src/net/sourceforge/pmd/ast/TokenMgrError.java" token="extends Error" value="extends RuntimeException" />
+        <replace file="src/net/sourceforge/pmd/ast/ParseException.java" token="extends Exception" value="extends RuntimeException" />
+        <replace file="src/net/sourceforge/pmd/ast/TokenMgrError.java" token="extends Error" value="extends RuntimeException" />
         <replace file="src/net/sourceforge/pmd/ast/JavaParserVisitor.java" token="SimpleNode" value="SimpleJavaNode" />	
     </target>
 
@@ -177,7 +177,6 @@
         <javacc target="src/net/sourceforge/pmd/jsp/ast/JspParser.jj" outputdirectory="src/net/sourceforge/pmd/jsp/ast" javacchome="${javacc-home.path}" />
         <delete file="src/net/sourceforge/pmd/jsp/ast/JspParser.jj" />
         <replace file="src/net/sourceforge/pmd/jsp/ast/JspParserTokenManager.java" token="throw new Error" value="throw new RuntimeException" />
-        <replace file="src/net/sourceforge/pmd/jsp/ast/JspParser.java" token="(Error)" value="(RuntimeException)" />
         <replace file="src/net/sourceforge/pmd/jsp/ast/JspParser.java" token="throw new Error" value="throw new RuntimeException" />
         <replace file="src/net/sourceforge/pmd/jsp/ast/JspCharStream.java" token="throw new Error" value="throw new RuntimeException" />
         <replace file="src/net/sourceforge/pmd/jsp/ast/ParseException.java" token="throw new Error" value="throw new RuntimeException" />
diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index e67f3bdd21..65629a9f9d 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -29,6 +29,7 @@ Implemented RFE 1415487 - Added a rulesets/releases/35.xml ruleset (and similar
 Wouter Zelle fixed a false positive in NonThreadSafeSingleton.
 Wouter Zelle fixed a false positive in InefficientStringBuffering.
 The CPD Ant task now supports an optional language attribute.
+Removed some ill-advised casts from the grammars.
 Fixed bug in CallSuperInConstructor; it no longer flag classes without extends clauses.
 Fixed release packaging; now entire xslt/ directory contents are included.
 Added more XSLT from Dave Corley - you can use them to filter PMD reports by priority level.
diff --git a/pmd/src/net/sourceforge/pmd/ast/JavaParser.java b/pmd/src/net/sourceforge/pmd/ast/JavaParser.java
index 0e3c3b2742..7df4988659 100644
--- a/pmd/src/net/sourceforge/pmd/ast/JavaParser.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParser.java
@@ -188,7 +188,7 @@ public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, Java
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -219,7 +219,7 @@ public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, Java
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -268,7 +268,7 @@ public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, Java
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -364,7 +364,7 @@ public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, Java
    if (jjte000 instanceof ParseException) {
      {if (true) throw (ParseException)jjte000;}
    }
-   {if (true) throw (RuntimeException)jjte000;}
+   {if (true) throw (Error)jjte000;}
     } finally {
    if (jjtc000) {
      jjtree.closeNodeScope(jjtn000, true);
@@ -439,7 +439,7 @@ public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, Java
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -529,7 +529,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -572,7 +572,7 @@ jjtn000.setModifiers(modifiers);
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -614,7 +614,7 @@ jjtn000.setModifiers(modifiers);
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -661,7 +661,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -762,7 +762,7 @@ jjtn000.setModifiers(modifiers);
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -806,7 +806,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -849,7 +849,7 @@ jjtn000.setModifiers(modifiers);
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -885,7 +885,7 @@ jjtn000.setModifiers(modifiers);
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -927,7 +927,7 @@ jjtn000.setModifiers(modifiers);
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -994,7 +994,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1090,7 +1090,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1133,7 +1133,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1170,7 +1170,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1268,7 +1268,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1350,7 +1350,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1408,7 +1408,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1453,7 +1453,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1513,7 +1513,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1576,7 +1576,7 @@ jjtn000.setModifiers(modifiers);
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -1642,7 +1642,7 @@ Token t;
       if (jjte000 instanceof ParseException) {
         {if (true) throw (ParseException)jjte000;}
       }
-      {if (true) throw (RuntimeException)jjte000;}
+      {if (true) throw (Error)jjte000;}
     } finally {
       if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
@@ -1726,7 +1726,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1763,7 +1763,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1813,7 +1813,7 @@ Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -1881,7 +1881,7 @@ Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -1935,7 +1935,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1978,7 +1978,7 @@ Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -2034,7 +2034,7 @@ Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -2075,7 +2075,7 @@ Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -2189,7 +2189,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2262,7 +2262,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2313,7 +2313,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2445,7 +2445,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2488,7 +2488,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2531,7 +2531,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2574,7 +2574,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2617,7 +2617,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2660,7 +2660,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2716,7 +2716,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2755,7 +2755,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2821,7 +2821,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2877,7 +2877,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2933,7 +2933,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -2994,7 +2994,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3076,7 +3076,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3105,7 +3105,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3134,7 +3134,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3217,7 +3217,7 @@ Token t;
    if (jjte000 instanceof ParseException) {
      {if (true) throw (ParseException)jjte000;}
    }
-   {if (true) throw (RuntimeException)jjte000;}
+   {if (true) throw (Error)jjte000;}
     } finally {
    if (jjtc000) {
      jjtree.closeNodeScope(jjtn000, true);
@@ -3304,7 +3304,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3354,7 +3354,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3400,7 +3400,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3437,7 +3437,7 @@ Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3470,7 +3470,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3548,7 +3548,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3615,7 +3615,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3680,7 +3680,7 @@ jjtree.openNodeScope(jjtn000);Token t;
   if (jjte000 instanceof ParseException) {
     {if (true) throw (ParseException)jjte000;}
   }
-  {if (true) throw (RuntimeException)jjte000;}
+  {if (true) throw (Error)jjte000;}
     } finally {
   if (jjtc000) {
     jjtree.closeNodeScope(jjtn000, true);
@@ -3785,7 +3785,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3826,7 +3826,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3897,7 +3897,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -3974,7 +3974,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4081,7 +4081,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4112,7 +4112,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4153,7 +4153,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4193,7 +4193,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4260,7 +4260,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4364,7 +4364,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4419,7 +4419,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4462,7 +4462,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4507,7 +4507,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4539,7 +4539,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4573,7 +4573,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4744,7 +4744,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4806,7 +4806,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4847,7 +4847,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4875,7 +4875,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -4986,7 +4986,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5016,7 +5016,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5048,7 +5048,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5097,7 +5097,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5129,7 +5129,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5158,7 +5158,7 @@ jjtree.openNodeScope(jjtn000);Token t;
       if (jjte000 instanceof ParseException) {
         {if (true) throw (ParseException)jjte000;}
       }
-      {if (true) throw (RuntimeException)jjte000;}
+      {if (true) throw (Error)jjte000;}
     } finally {
       if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
@@ -5199,7 +5199,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5290,7 +5290,7 @@ jjtree.openNodeScope(jjtn000);Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -5329,7 +5329,7 @@ jjtree.openNodeScope(jjtn000);Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -5358,7 +5358,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5390,7 +5390,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5431,7 +5431,7 @@ jjtree.openNodeScope(jjtn000);Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -5462,7 +5462,7 @@ jjtree.openNodeScope(jjtn000);Token t;
       if (jjte000 instanceof ParseException) {
         {if (true) throw (ParseException)jjte000;}
       }
-      {if (true) throw (RuntimeException)jjte000;}
+      {if (true) throw (Error)jjte000;}
     } finally {
       if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
@@ -5530,7 +5530,7 @@ jjtree.openNodeScope(jjtn000);Token t;
      if (jjte000 instanceof ParseException) {
        {if (true) throw (ParseException)jjte000;}
      }
-     {if (true) throw (RuntimeException)jjte000;}
+     {if (true) throw (Error)jjte000;}
     } finally {
      if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
@@ -5578,7 +5578,7 @@ jjtree.openNodeScope(jjtn000);Token t;
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5612,7 +5612,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5676,7 +5676,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -5787,7 +5787,7 @@ jjtn000.setModifiers(modifiers);
    if (jjte000 instanceof ParseException) {
      {if (true) throw (ParseException)jjte000;}
    }
-   {if (true) throw (RuntimeException)jjte000;}
+   {if (true) throw (Error)jjte000;}
     } finally {
    if (jjtc000) {
      jjtree.closeNodeScope(jjtn000, true);
@@ -5816,7 +5816,7 @@ jjtn000.setModifiers(modifiers);
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
diff --git a/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java b/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java
index 32f6b89059..7ca906a521 100644
--- a/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java
+++ b/pmd/src/net/sourceforge/pmd/jsp/ast/JspParser.java
@@ -60,7 +60,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -194,7 +194,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
           if (jjte000 instanceof ParseException) {
             {if (true) throw (ParseException)jjte000;}
           }
-          {if (true) throw (RuntimeException)jjte000;}
+          {if (true) throw (Error)jjte000;}
     } finally {
           if (jjtc000) {
             jjtree.closeNodeScope(jjtn000, true);
@@ -283,7 +283,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
           if (jjte000 instanceof ParseException) {
             {if (true) throw (ParseException)jjte000;}
           }
-          {if (true) throw (RuntimeException)jjte000;}
+          {if (true) throw (Error)jjte000;}
     } finally {
           if (jjtc000) {
             jjtree.closeNodeScope(jjtn000, true);
@@ -433,7 +433,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
           if (jjte000 instanceof ParseException) {
             {if (true) throw (ParseException)jjte000;}
           }
-          {if (true) throw (RuntimeException)jjte000;}
+          {if (true) throw (Error)jjte000;}
     } finally {
           if (jjtc000) {
             jjtree.closeNodeScope(jjtn000, true);
@@ -681,7 +681,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
       if (jjte000 instanceof ParseException) {
         {if (true) throw (ParseException)jjte000;}
       }
-      {if (true) throw (RuntimeException)jjte000;}
+      {if (true) throw (Error)jjte000;}
     } finally {
       if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
@@ -712,7 +712,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -845,7 +845,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
           if (jjte000 instanceof ParseException) {
             {if (true) throw (ParseException)jjte000;}
           }
-          {if (true) throw (RuntimeException)jjte000;}
+          {if (true) throw (Error)jjte000;}
     } finally {
           if (jjtc000) {
             jjtree.closeNodeScope(jjtn000, true);
@@ -964,7 +964,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
     if (jjte000 instanceof ParseException) {
       {if (true) throw (ParseException)jjte000;}
     }
-    {if (true) throw (RuntimeException)jjte000;}
+    {if (true) throw (Error)jjte000;}
     } finally {
     if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
@@ -1021,7 +1021,7 @@ public class JspParser/*@bgen(jjtree)*/implements JspParserTreeConstants, JspPar
           if (jjte000 instanceof ParseException) {
             {if (true) throw (ParseException)jjte000;}
           }
-          {if (true) throw (RuntimeException)jjte000;}
+          {if (true) throw (Error)jjte000;}
     } finally {
           if (jjtc000) {
             jjtree.closeNodeScope(jjtn000, true);
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 589d391afd..9340fbfc7f 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -48,12 +48,12 @@
         </subsection>
         <subsection name="Contributors">
         <ul>
+            <li>Xavier Le Vourch - Suggestions on cleaning up casts in grammar, SimplifyBooleanAssertion, patch to fix problem with TestClassWithoutTestCases, patch to fix rule name bugs in migration rulesets</li>
             <li>Mathieu Champlon - Added language support to the CPD Ant task</li>
             <li>Wouter Zelle - Fixed a false positive in InefficientStringBuffering, fixed a false positive in NonThreadSafeSingleton, a nice patch to clean up some of the Ant task properties and fix a TextRenderer bug, rewrote PositionLiteralsFirstInComparisons in XPath, Renderer improvement suggestions, wrote NonThreadSafeSingleton rule, wrote DefaultPackage rule, worked thru ASTMethodDeclaration.isSyntacticallyX design, reported docs bug 1292689 for UnnecessaryLocalBeforeReturn, reported leftover ExceptionTypeChecking source file, rewrote UselessOverridingMethod in Java, UselessOverridingMethod rule, ProperLogger rule, nifty code to allow variables in XPath rules, externalInfoUrl data for all rules in basic and unusedcode rulesets, some very nifty XSLT, improvements to UseCorrectExceptionLogging, designed and implemented the "externalInfoUrl" feature in the rule definitions, fixed a devious bug in RuleSetFactory, AvoidPrintStackTrace, initial implementation of SimplifyConditional</li>
             <li>Uroshnor - Reported bug in UseNotifyAllInsteadOfNotify</li>
             <li>Jan Koops - Noted missing data in MemberValuePair nodes, bug report for JBuilder plugin</li>
             <li>Christopher Stach - several bug reports for rules that didn't handle JDK 1.5 enums</li>
-            <li>Xavier Le Vourch - SimplifyBooleanAssertion, patch to fix problem with TestClassWithoutTestCases, patch to fix rule name bugs in migration rulesets</li>
             <li><a href="http://tersesystems.com/">Will Sargent</a> - Implemented AvoidThreadGroup, AvoidThrowingCertainExceptionTypesRule, AvoidCatchingNPERule, ExceptionAsFlowControlRule, URL updates for 'Similar projects' page</li>
             <li>Benoit Xhenseval - noted Maven plugin bug (http://jira.codehaus.org/browse/MPPMD-24), bug report for UnusedPrivateMethod, suggestion to add elapsed time to XML report, bug report for ImmutableField, many bug reports (with good failure cases!), Ant task patch and bug report, XSLT patch, suggestion for improving XML report</li>
             <li>Barak Naveh - Reported and fixed bug in CallSuperInConstructor</li>