diff --git a/Mage/src/main/java/mage/game/Table.java b/Mage/src/main/java/mage/game/Table.java
index 5b6f223021..eba4df35c6 100644
--- a/Mage/src/main/java/mage/game/Table.java
+++ b/Mage/src/main/java/mage/game/Table.java
@@ -298,8 +298,8 @@ public class Table implements Serializable {
                 .setGameType(this.getGameType())
                 .setDeckType(this.getDeckType())
                 .setControllerName(this.getControllerName())
-                .setStartTimeMs(this.getStartTime().getTime())
-                .setEndTimeMs(this.getEndTime().getTime())
+                .setStartTimeMs(this.getStartTime() != null ? this.getStartTime().getTime() : 0L)
+                .setEndTimeMs(this.getEndTime() != null ? this.getEndTime().getTime() : 0L)
                 .build();
     }
 }