1 files changed, 19 insertions, 5 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index dc86bc89..a2771244 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -176,11 +176,25 @@ void connectToServer(ServerInfo &server)
 
 void unload()
 {
-    if (generalHandler)
-    {
-        generalHandler->unload();
-        delete generalHandler;
-    }
+    if (!generalHandler)
+        return;
+
+    generalHandler->unload();
+    delete generalHandler;
+
+    adminHandler = nullptr;
+    charHandler = nullptr;
+    chatHandler = nullptr;
+    generalHandler = nullptr;
+    inventoryHandler = nullptr;
+    loginHandler = nullptr;
+    gameHandler = nullptr;
+    guildHandler = nullptr;
+    npcHandler = nullptr;
+    partyHandler = nullptr;
+    playerHandler = nullptr;
+    abilityHandler = nullptr;
+    tradeHandler = nullptr;
 }
 
 ServerType getNetworkType()