diff --git a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
index 1f13172..ac57c57 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
@@ -114,6 +114,8 @@ namespace HISP.Server
             // Stop Timers
             if (timeoutTimer != null)
                 timeoutTimer.Dispose();
+            if (keepAliveTimer != null)
+                keepAliveTimer.Dispose();
             if (warnTimer != null)
                 warnTimer.Dispose();
             if (kickTimer != null)
@@ -126,8 +128,11 @@ namespace HISP.Server
             LoggedIn = false;
 
             // Close Socket
-            ClientSocket.Close();
-            ClientSocket.Dispose();
+            if(ClientSocket != null)
+            {
+                ClientSocket.Close();
+                ClientSocket.Dispose();
+            }
 
         }