diff --git a/src/tcp.c b/src/tcp.c
index 89cedf2a..272ba787 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -640,6 +640,9 @@ tcp_server_delete(void *server)
   tcp_server_t *ts = server;
   tvhpoll_event_t ev;
 
+  if (server == NULL)
+    return;
+
   memset(&ev, 0, sizeof(ev));
   ev.fd       = ts->serverfd;
   ev.events   = TVHPOLL_IN;