diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index 348ba1e08fb..774b39d5745 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -698,7 +698,7 @@ class TableTableModel extends AbstractTableModel {
 
     public static final int ACTION_COLUMN = 9; // column the action is located (starting with 0)
 
-    private final String[] columnNames = new String[]{"Match Name", "Owner / Players", "Game Type", "Wins", "Free Mulligans", "Deck Type", "Info", "Status", "Created", "Action"};
+    private final String[] columnNames = new String[]{"Match Name", "Owner / Players", "Game Type", "Wins", "Free Mulligans", "Deck Type", "Info", "Status", "Created / Started", "Action"};
     private TableView[] tables = new TableView[0];
     private static final DateFormat timeFormatter = SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
 
diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/mage/view/TableView.java
index 5253b3d5b4d..474f1f791d9 100644
--- a/Mage.Common/src/mage/view/TableView.java
+++ b/Mage.Common/src/mage/view/TableView.java
@@ -67,7 +67,9 @@ public class TableView implements Serializable {
         this.tableName = table.getName();
         this.controllerName = table.getControllerName();
         this.tableState = table.getState();
-        if (table.getState().equals(TableState.WAITING) || table.getState().equals(TableState.WAITING)) {
+        if (table.getState().equals(TableState.WAITING) || 
+                table.getState().equals(TableState.READY_TO_START) ||
+                table.getState().equals(TableState.STARTING) ) {
             this.createTime = table.getCreateTime();
         } else {
             if (table.isTournament()) {
diff --git a/Mage/src/mage/game/match/MatchImpl.java b/Mage/src/mage/game/match/MatchImpl.java
index ec56fd5f096..0368ab351a3 100644
--- a/Mage/src/mage/game/match/MatchImpl.java
+++ b/Mage/src/mage/game/match/MatchImpl.java
@@ -350,10 +350,13 @@ public abstract class MatchImpl implements Match {
         sb.append("\nGame has started\n");
         return sb.toString();
     }
-    
+
     @Override
     public Date getStartTime() {
-        return new Date(startTime.getTime());
+        if (startTime != null) {
+            return new Date(startTime.getTime());
+        }
+        return null;
     }
 
     @Override