diff --git a/fuzzing/EpollHelloWorld.cpp b/fuzzing/EpollHelloWorld.cpp
index f54b6e9..a33269a 100644
--- a/fuzzing/EpollHelloWorld.cpp
+++ b/fuzzing/EpollHelloWorld.cpp
@@ -99,7 +99,7 @@ void teardown() {
 	/* If we are called twice there's a bug (it potentially could if
 	 * all open sockets cannot be error-closed in one epoll_wait call).
 	 * But we only allow 1k FDs and we have a buffer of 1024 from epoll_wait */
-	if (!listen_socket) {
+	if (!listen_socket && !client) {
 		exit(-1);
 	}
 
@@ -110,7 +110,8 @@ void teardown() {
 
 	/* We might have open sockets still, and these will be error-closed by epoll_wait */
 	// us_socket_context_close - close all open sockets created with this socket context
-
-	us_listen_socket_close(0, listen_socket);
-	listen_socket = NULL;
+    if (listen_socket) {
+        us_listen_socket_close(0, listen_socket);
+        listen_socket = NULL;
+    }
 }
diff --git a/fuzzing/libEpollFuzzer b/fuzzing/libEpollFuzzer
index 02dd669..79cce7c 160000
--- a/fuzzing/libEpollFuzzer
+++ b/fuzzing/libEpollFuzzer
@@ -1 +1 @@
-Subproject commit 02dd669dfd70d0de507e7732468c3127c054aea1
+Subproject commit 79cce7ca4700944a58b24add9e2f4bc5c858811c
diff --git a/uSockets b/uSockets
index 42bdf7f..c49ea94 160000
--- a/uSockets
+++ b/uSockets
@@ -1 +1 @@
-Subproject commit 42bdf7fbd25a500808f694ac6b125e837eb42a33
+Subproject commit c49ea94c11a77ccbe51b929261f250997332d2c7