diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.java
index d75c17caaf9..40adadf37ed 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/regattaStatus/RegattaStatusRace.java
@@ -51,8 +51,10 @@ public class RegattaStatusRace extends Composite {
     }
     
     private void initRaceFlagInfo(FlagStateDTO value) {
-        raceFlagContainerUi.setInnerSafeHtml(SailingFlagsBuilder.render(value, 0.40, FlagsMeaningExplanator.getFlagsMeaning(I18N,
-                value.getLastUpperFlag(), value.getLastLowerFlag(), value.isLastFlagsAreDisplayed())));
+        if (value != null) {
+            raceFlagContainerUi.setInnerSafeHtml(SailingFlagsBuilder.render(value, 0.40, FlagsMeaningExplanator
+                    .getFlagsMeaning(I18N, value.getLastUpperFlag(), value.getLastLowerFlag(), value.isLastFlagsAreDisplayed())));
+        }
     }
 
     private void initRaceStateOrLegsInfo(RaceViewState state, Date start, RaceProgressDTO progress) {
@@ -63,7 +65,7 @@ public class RegattaStatusRace extends Composite {
         } else {
             raceLegsInfoUi.removeFromParent();
             raceStateInfoUi.setInnerText(state.getLabel());
-            if (state == RaceViewState.SCHEDULED) {
+            if (state == RaceViewState.SCHEDULED && start != null) {
                 double min = MillisecondsTimePoint.now().until(new MillisecondsTimePoint(start)).asMinutes();
                 raceStateInfoUi.setInnerText(I18N.startingInMinutes((int) min));
             }