Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 16907)
+++ /trunk/build.xml	(revision 16908)
@@ -248,4 +248,5 @@
         <mkdir dir="${mapcss.dir}/parsergen"/>
         <java classname="javacc" fork="true" failonerror="true">
+            <classpath path="${tools.dir}/javacc"/>
             <classpath refid="javacc.classpath"/>
             <arg value="-DEBUG_PARSER=false"/>
Index: /trunk/tools/javacc/templates/ParseException.template
===================================================================
--- /trunk/tools/javacc/templates/ParseException.template	(revision 16907)
+++ /trunk/tools/javacc/templates/ParseException.template	(revision 16908)
@@ -120,5 +120,7 @@
     }
 #if KEEP_LINE_COLUMN
-    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    if (currentToken.next != null) {
+      retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    }
 #fi
     retval += "." + EOL;