diff --git a/src/ChangeLog b/src/ChangeLog
index ab3a2d89..ec46ecae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-06  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* http.c (gethttp): When freeing MESSAGE, take into account that
+	it can be NULL.
+
 2005-07-05  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* cmpt.c (timegm): Handle years after 2099.
diff --git a/src/http.c b/src/http.c
index 3428f861..6f298e60 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1704,7 +1704,7 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
     hs->error = xstrdup (_("(no description)"));
   else
     hs->error = xstrdup (message);
-  xfree (message);
+  xfree_null (message);
 
   type = resp_header_strdup (resp, "Content-Type");
   if (type)