diff --git a/server/channelserver/handlers.go b/server/channelserver/handlers.go
index 3dd1fa76c..dbd056a3a 100644
--- a/server/channelserver/handlers.go
+++ b/server/channelserver/handlers.go
@@ -253,7 +253,7 @@ func logoutPlayer(s *Session) {
 	removeSessionFromStage(s)
 
 	saveData, err := GetCharacterSaveData(s, s.charID)
-	if err != nil {
+	if err != nil || saveData == nil {
 		s.logger.Error("Failed to get savedata")
 		return
 	}