diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapPanel.java
index 5afce98ed74..effa82e86c7 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceMapPanel.java
@@ -150,7 +150,9 @@ public class RaceMapPanel extends FormPanel implements EventDisplayer, TimeListe
         switch(timer.getPlayMode()) {
             case Live:
             case Replay:
-                timer.setTime(selectedRace.startOfRace.getTime());
+                if(selectedRace.startOfRace != null) {
+                    timer.setTime(selectedRace.startOfRace.getTime());
+                }
                 break;
         }
         timePanel.setLegMarkers();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
index 0debcbc63c2..962e4244743 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
@@ -65,7 +65,7 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
     private final Timer timer;
     private final RaceSelectionProvider raceSelectionProvider;
     
-    public RaceBoardPanel(SailingServiceAsync sailingService, RaceSelectionProvider raceSelectionProvider, String leaderboardName, 
+    public RaceBoardPanel(SailingServiceAsync sailingService, RaceSelectionProvider raceSelectionProvider, String leaderboardName,
             ErrorReporter errorReporter, final StringMessages stringMessages) {
         this.sailingService = sailingService;
         this.raceSelectionProvider = raceSelectionProvider;
@@ -210,7 +210,9 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel
             switch(timer.getPlayMode()) {
                 case Live:
                 case Replay:
-                    timer.setTime(selectedRace.startOfRace.getTime());
+                    if(selectedRace.startOfRace != null) {
+                        timer.setTime(selectedRace.startOfRace.getTime());
+                    }
                     break;
             }
             timePanel.setLegMarkers();