diff --git a/ChangeLog b/ChangeLog
index 8f223d4f..03bd7374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec  7 22:27:31 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* error.c: fixed __xmlRaiseError to use structured error handlers
+	  defined by xmlSetStructuredErrorFunc(), fixes bug #126211
+
 Sun Dec  7 20:30:53 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* parser.c: attempt to fix #126211 ... 
diff --git a/error.c b/error.c
index 3d4188be..1e81b432 100644
--- a/error.c
+++ b/error.c
@@ -454,6 +454,8 @@ __xmlRaiseError(xmlStructuredErrorFunc schannel,
 	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
 	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
 	    schannel = ctxt->sax->serror;
+	if (schannel == NULL)
+	    schannel = xmlStructuredError;
     }
     if ((domain == XML_FROM_VALID) &&
         ((channel == xmlParserValidityError) ||