1 files changed, 9 insertions, 2 deletions
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 242e9f9de..adaaa067b 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -107,9 +107,16 @@ void GameHandler::connect()
 
     if (Client::getState() == STATE_CONNECT_GAME)
     {
-        mCharID = player_node->getId();
         // Change the player's ID to the account ID to match what eAthena uses
-        player_node->setId(token.account_ID);
+        if (player_node)
+        {
+            mCharID = player_node->getId();
+            player_node->setId(token.account_ID);
+        }
+        else
+        {
+            mCharID = 0;
+        }
     }
 
     // Send login infos