diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java
index f1070050811..ab6f404de2c 100644
--- a/Mage.Server/src/main/java/mage/server/Session.java
+++ b/Mage.Server/src/main/java/mage/server/Session.java
@@ -373,7 +373,7 @@ public class Session {
         } catch (HandleCallbackException ex) {
             ex.printStackTrace();
             UserManager.getInstance().getUser(userId).ifPresent(user-> {
-                logger.warn("SESSION CALLBACK EXCEPTION - " + (user != null ? user.getName() : "") + " userId " + userId);
+                logger.warn("SESSION CALLBACK EXCEPTION - " + user.getName() + " userId " + userId);
                 logger.warn(" - method: " + call.getMethod());
                 logger.warn(" - cause: " + getBasicCause(ex).toString());
                 logger.trace("Stack trace:", ex);
diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java
index 53870741f8c..0417687ab76 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameController.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameController.java
@@ -313,6 +313,10 @@ public class GameController implements GameCallback {
             logger.fatal("- userId: " + userId);
             return;
         }
+		if(!user.isPresent(){
+			logger.fatal("User not found : "+userId);
+			return;
+		}
         Player player = game.getPlayer(playerId);
         if (player == null) {
             logger.fatal("Player not found - playerId: " + playerId);