diff --git a/Mage/src/mage/game/Table.java b/Mage/src/mage/game/Table.java
index 3764b10d38..3a05080be8 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() {