diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 45ff4ba7..08eecc4e 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -1731,7 +1731,7 @@ MHD_start_daemon_va (unsigned int options,
       CLOSE (socket_fd);
       return NULL;
     }
-  else if (retVal->worker_pool_size > 0)
+  if (retVal->worker_pool_size > 0)
     {
 #ifndef MINGW
       int sk_flags;
diff --git a/src/daemon/response.c b/src/daemon/response.c
index f1379301..ae2b8615 100644
--- a/src/daemon/response.c
+++ b/src/daemon/response.c
@@ -307,6 +307,7 @@ MHD_create_response_from_data (size_t size,
       tmp = malloc (size);
       if (tmp == NULL)
         {
+	  pthread_mutex_destroy (&retVal->mutex);
           free (retVal);
           return NULL;
         }