diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py
index 6040c71c38..29bd36abf3 100644
--- a/direct/src/distributed/ClientRepository.py
+++ b/direct/src/distributed/ClientRepository.py
@@ -277,13 +277,23 @@ class ClientRepository(DirectObject.DirectObject):
         return None
 
     def handleUnexpectedMsgType(self, msgType, di):
+        currentLoginState = self.loginFSM.getCurrentState()
+        if currentLoginState:
+            currentLoginStateName = currentLoginState.getName()
+        else:
+            currentLoginStateName = "None"
+        currentGameState = self.gameFSM.getCurrentState()
+        if currentGameState:
+            currentGameStateName = currentGameState.getName()
+        else:
+            currentGameStateName = "None"
         ClientRepository.notify.warning(
             "Ignoring unexpected message type: " +
             str(msgType) +
             " login state: " +
-            self.loginFSM.getCurrentState().getName() +
+            currentLoginStateName +
             " game state: " +
-            self.gameFSM.getCurrentState().getName())
+            currentGameStateName)
         return None
 
     def sendSetShardMsg(self, shardId):