diff --git a/os/connection.c b/os/connection.c
index 8e7513902..2a4fc8db8 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -523,7 +523,8 @@ CloseWellKnownConnections(void)
         if (ListenTransConns[i] != NULL) {
             _XSERVTransClose(ListenTransConns[i]);
             ListenTransConns[i] = NULL;
-            RemoveNotifyFd(ListenTransFds[i]);
+            if (ListenTransFds != NULL)
+                RemoveNotifyFd(ListenTransFds[i]);
         }
     }
     ListenTransCount = 0;