Index: jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java
===================================================================
--- jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java	(revision 639485)
+++ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java	(working copy)
@@ -296,10 +296,10 @@
             }
             query.jjtAccept(this, root);
         } catch (ParseException e) {
-            throw new InvalidQueryException(e.getMessage(), e);
+            throw new InvalidQueryException(e.getMessage() + " for statement: " + statement, e);
         } catch (Throwable t) {
             // also catch any other exception
-            throw new InvalidQueryException(t.getMessage(), t);
+            throw new InvalidQueryException(t.getMessage() + " for statement: " + statement, t);
         }
         if (exceptions.size() > 0) {
             // simply report the first one