From 95b39bd44ccd601f859eae976a3bf4b921e0dae4 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 16 Mar 2014 00:36:36 +0100
Subject: [PATCH] Fixed a bug in table cleanup that prevented removing of
 canceled tables (not started yet) from the list of tables.

---
 Mage/src/mage/game/Table.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mage/src/mage/game/Table.java b/Mage/src/mage/game/Table.java
index 3764b10d38a..3a05080be83 100644
--- a/Mage/src/mage/game/Table.java
+++ b/Mage/src/mage/game/Table.java
@@ -140,7 +140,9 @@ public class Table implements Serializable {
      * 
      */
     public void cleanUp() {
-        match.cleanUpOnMatchEnd(isTournament);
+        if (match != null) {
+            match.cleanUpOnMatchEnd(isTournament);
+        }
     }
 
     public String getGameType() {