diff --git a/src/fcgisrv/fcgi_server.c b/src/fcgisrv/fcgi_server.c
index 68e39cb..80a6260 100644
--- a/src/fcgisrv/fcgi_server.c
+++ b/src/fcgisrv/fcgi_server.c
@@ -233,6 +233,8 @@ fcgi_register_handler(HFcgi hfcgi, char* path, fcgi_handler_t* handler)
 static void
 fcgi_unregister_handlers(HFcgi hfcgi)
 {
+    if (hfcgi == NULL) return;
+
     fcgi_handler_map_clear(&hfcgi->handler_map);
 }