From 1ea69ee6c864a4f035f88e3251923564f13e4466 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Wed, 11 May 2011 21:50:31 +0400
Subject: [PATCH] Fixed NPE in SessionManager.

---
 Mage.Server/src/main/java/mage/server/ServerImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Mage.Server/src/main/java/mage/server/ServerImpl.java b/Mage.Server/src/main/java/mage/server/ServerImpl.java
index ba474dfe3bd..630e78c919e 100644
--- a/Mage.Server/src/main/java/mage/server/ServerImpl.java
+++ b/Mage.Server/src/main/java/mage/server/ServerImpl.java
@@ -238,7 +238,10 @@ public class ServerImpl extends RemoteServer implements Server {
 				new Runnable() {
 					@Override
 					public void run() {
-						SessionManager.getInstance().getSession(sessionId).kill();
+						Session session = SessionManager.getInstance().getSession(sessionId);
+						if (session != null) {
+							session.kill();
+						}
 						logger.info("Client deregistered ...");
 					}
 				}