diff --git a/AUTHORS b/AUTHORS
index a22de935..9f2bcac1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ John Muth <muth@parascale.com>
 Geoffrey McRae <geoff@spacevs.com>
 Piotr Grzybowski <narsil.pl@gmail.com>
 Gerrit Telkamp <g.telkamp@domologic.de>
+Erik Slagter <erik@slagter.name>
 
 Documentation contributions also came from:
 Marco Maggi <marco.maggi-ipsu@poste.it>
diff --git a/ChangeLog b/ChangeLog
index eb453f5f..7322a25c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Wed Sep 15 09:33:46 CEST 2010
+	Fixed double-free. -CG/ES
+
 Fri Sep 10 14:47:11 CEST 2010
 	Releasing libmicrohttpd 0.9.1. -CG
 
diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index 532cab49..af1a925d 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -1643,6 +1643,7 @@ parse_connection_headers (struct MHD_Connection *connection)
                 "Received `%s' request without `%s' header.\n",
                 MHD_HTTP_VERSION_1_1, MHD_HTTP_HEADER_HOST);
 #endif
+      EXTRA_CHECK (connection->response == NULL);
       response =
         MHD_create_response_from_data (strlen (REQUEST_LACKS_HOST),
                                        REQUEST_LACKS_HOST, MHD_NO, MHD_NO);
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 2daedafd..9b39d7e1 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -952,7 +952,6 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
 		  abort();
 		}
             }
-          MHD_destroy_response (pos->response);
           MHD_pool_destroy (pos->pool);
 #if HTTPS_SUPPORT
           if (pos->tls_session != NULL)