diff --git a/source/smbd/process_single.c b/source/smbd/process_single.c
index 554f3e91daa..8bd00c53b95 100644
--- a/source/smbd/process_single.c
+++ b/source/smbd/process_single.c
@@ -68,8 +68,18 @@ static void single_accept_connection(struct event_context *ev, struct fd_event *
 static void single_terminate_connection(struct server_connection *conn, const char *reason) 
 {
 	DEBUG(0,("single_terminate_connection: reason[%s]\n",reason));
-	conn->service->ops->close_connection(conn,reason);
-	server_destroy_connection(conn);
+
+	if (conn) {
+		if (conn->service) {
+			conn->service->ops->close_connection(conn,reason);
+		}
+
+		if (conn->server_socket) {
+			DLIST_REMOVE(conn->server_socket->connection_list,conn);
+		}
+
+		server_destroy_connection(conn);
+	}
 }
 
 static int single_get_id(struct smbsrv_request *req)
diff --git a/source/smbd/process_standard.c b/source/smbd/process_standard.c
index 19306656b5d..c12a1f4305e 100644
--- a/source/smbd/process_standard.c
+++ b/source/smbd/process_standard.c
@@ -91,8 +91,19 @@ static void standard_accept_connection(struct event_context *ev, struct fd_event
 static void standard_terminate_connection(struct server_connection *conn, const char *reason) 
 {
 	DEBUG(0,("single_terminate_connection: reason[%s]\n",reason));
-	conn->service->ops->close_connection(conn,reason);
-	server_destroy_connection(conn);
+
+	if (conn) {
+		if (conn->service) {
+			conn->service->ops->close_connection(conn,reason);
+		}
+
+		if (conn->server_socket) {
+			DLIST_REMOVE(conn->server_socket->connection_list,conn);
+		}
+
+		server_destroy_connection(conn);
+	}
+
 	/* terminate this process */
 	exit(0);
 }
diff --git a/source/smbd/process_thread.c b/source/smbd/process_thread.c
index 687dafea04f..ced07d5d76c 100644
--- a/source/smbd/process_thread.c
+++ b/source/smbd/process_thread.c
@@ -108,8 +108,21 @@ static void thread_accept_connection(struct event_context *ev, struct fd_event *
 static void thread_terminate_connection(struct server_connection *conn, const char *reason) 
 {
 	DEBUG(0,("thread_terminate_connection: reason[%s]\n",reason));
-	conn->service->ops->close_connection(conn,reason);
-	server_destroy_connection(conn);
+
+	if (conn) {
+		if (conn->service) {
+			conn->service->ops->close_connection(conn,reason);
+		}
+
+		if (conn->server_socket) {
+			MUTEX_LOCK_BY_ID(MUTEX_SMBD);
+			DLIST_REMOVE(conn->server_socket->connection_list,conn);
+			MUTEX_UNLOCK_BY_ID(MUTEX_SMBD);
+		}
+
+		server_destroy_connection(conn);
+	}
+
 	/* terminate this thread */
 	pthread_exit(NULL);  /* thread cleanup routine will do actual cleanup */
 }
diff --git a/source/smbd/service.c b/source/smbd/service.c
index d225a69b175..c90792e4525 100644
--- a/source/smbd/service.c
+++ b/source/smbd/service.c
@@ -247,8 +247,11 @@ void server_terminate_connection(struct server_connection *srv_conn, const char
 void server_destroy_connection(struct server_connection *srv_conn)
 {
 	close(srv_conn->event.fde->fd);
+
 	event_remove_fd(srv_conn->event.ctx, srv_conn->event.fde);
 	event_remove_timed(srv_conn->event.ctx, srv_conn->event.idle);
+
+	talloc_destroy(srv_conn->mem_ctx);
 }
 
 void server_io_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags)