--- error.c.orig	2010-10-12 08:25:32.000000000 +0200
+++ error.c	2012-03-01 17:00:06.000000000 +0100
@@ -606,7 +606,11 @@
 	} else {
 	    channel = xmlGenericError;
 	    if (!data) {
-		data = xmlGenericErrorContext;
+	        if (ctxt != NULL) {
+	            data = ctxt;
+	        } else {
+	            data = xmlGenericErrorContext;
+	        }
 	    }
 	}
     }