diff --git a/ChangeLog b/ChangeLog
index b7689b60..b2a56abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun  2 15:34:17 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* encoding.c: small fix
+	* xmlIO.c: fixed an error message
+
 Tue May 20 14:21:23 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* parserInternals.c: fixing Red Hat bug #91013 where xmllint was
diff --git a/encoding.c b/encoding.c
index de69abfd..8d43f45d 100644
--- a/encoding.c
+++ b/encoding.c
@@ -2205,7 +2205,7 @@ retry:
 	if (handler->output != NULL) {
 	    ret = handler->output(&out->content[out->use], &written,
 				  NULL, &toconv);
-	    if (ret == 0) { /* Gennady: check return value */
+	    if (ret >= 0) { /* Gennady: check return value */
 		out->use += written;
 		out->content[out->use] = 0;
 	    }
diff --git a/xmlIO.c b/xmlIO.c
index a3b1dc07..f096e509 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -2182,7 +2182,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
     if (needSize > in->buffer->size){
         if (!xmlBufferResize(in->buffer, needSize)){
             xmlGenericError(xmlGenericErrorContext,
-		    "xmlBufferAdd : out of memory!\n");
+		    "xmlParserInputBufferGrow : out of memory!\n");
             return(0);
         }
     }