diff --git a/ChangeLog b/ChangeLog
index 40110879..c8204cdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep  3 16:51:55 CEST 2005 Rob Richards <rrichards@ctindustries.net>
+
+	* xmlsave.c: check for NULL to prevent crash with meta elements
+
 Sat Sep  3 16:26:55 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* relaxng.c: structured error reporting problem with Relax-NG
diff --git a/xmlsave.c b/xmlsave.c
index 943a84b6..571427dc 100644
--- a/xmlsave.c
+++ b/xmlsave.c
@@ -1216,11 +1216,13 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
 				xmlChar *httpequiv;
 
 				httpequiv = xmlGetProp(tmp, BAD_CAST"http-equiv");
-				if (xmlStrcasecmp(httpequiv, BAD_CAST"Content-Type") == 0) {
+				if (httpequiv != NULL) {
+					if (xmlStrcasecmp(httpequiv, BAD_CAST"Content-Type") == 0) {
+						xmlFree(httpequiv);
+						break;
+					}
 					xmlFree(httpequiv);
-					break;
 				}
-				xmlFree(httpequiv);
 			}
 			tmp = tmp->next;
 		}