diff --git a/ChangeLog b/ChangeLog
index ba2c414f..843694ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 28 19:54:37 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* xpath.c: applied patch from nico@xtradyne.com for #125030
+
 Tue Oct 28 16:42:16 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* Makefile.am: cleanup
diff --git a/xpath.c b/xpath.c
index 6b5f1569..6e7e4716 100644
--- a/xpath.c
+++ b/xpath.c
@@ -10765,7 +10765,13 @@ xmlXPathCompile(const xmlChar *str) {
 
     ctxt = xmlXPathNewParserContext(str, NULL);
     xmlXPathCompileExpr(ctxt);
-    
+
+    if( ctxt->error != XPATH_EXPRESSION_OK )
+    {
+        xmlXPathFreeParserContext(ctxt);
+        return (0);
+    }
+
     if (*ctxt->cur != 0) {
 	/* 
 	 * aleksey: in some cases this line prints *second* error message