diff --git a/Mage.Server/src/main/java/mage/server/SessionManager.java b/Mage.Server/src/main/java/mage/server/SessionManager.java
index e3482be328..839daf1dda 100644
--- a/Mage.Server/src/main/java/mage/server/SessionManager.java
+++ b/Mage.Server/src/main/java/mage/server/SessionManager.java
@@ -49,6 +49,7 @@ public class SessionManager {
 	private ConcurrentHashMap<UUID, Session> sessions = new ConcurrentHashMap<UUID, Session>();
 
 	public Session getSession(UUID sessionId) {
+		if (sessions == null || sessionId == null) return null;
 		return sessions.get(sessionId);
 	}