diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java
index e759fabd264..82ee40e3deb 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java
@@ -18,11 +18,11 @@ public interface TrackedLegOfCompetitor {
 
     /**
      * How much time did the {@link #getCompetitor competitor} spend in this {@link #getLeg() leg} at
-     * <code>timePoint</code>? If the competitor hasn't started the leg yet at <code>timePoint</code>, 0 is returned. If the
-     * competitor has finished the leg already at <code>timePoint</code>, the time it took the competitor to
-     * complete the leg is returned. 
+     * <code>timePoint</code>? If the competitor hasn't started the leg yet at <code>timePoint</code>, <code>null</code>
+     * is returned. If the competitor has finished the leg already at <code>timePoint</code>, the time it took the
+     * competitor to complete the leg is returned.
      */
-    long getTimeInMilliSeconds(TimePoint timePoint);
+    Long getTimeInMilliSeconds(TimePoint timePoint);
 
     /**
      * The distance over ground traveled by the competitor in this leg up to <code>timePoint</code>. If
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegEntryDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegEntryDTO.java
index c799c1e6734..9eceb982aaf 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegEntryDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegEntryDTO.java
@@ -19,7 +19,7 @@ public class LegEntryDTO implements IsSerializable {
     public Double currentSpeedOverGroundInKnots;
     public Double velocityMadeGoodInKnots;
     public Double windwardDistanceToGoInMeters;
-    public long timeInMilliseconds;
+    public Long timeInMilliseconds;
     public boolean started;
     public boolean finished;
     public Integer numberOfJibes;
diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java
index a31f39964b3..b49dc628a18 100755
--- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java
+++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java
@@ -76,7 +76,8 @@ public class GPSPerRace extends Action {
                             posGL = legRank - previousLeg.getTrackedLeg(competitor).getRank(time);
                         }
                         final Double gapToLeader = trackedLegOfCompetitor.getGapToLeaderInSeconds(time);
-                        final double legTime = 1. / 1000. * trackedLegOfCompetitor.getTimeInMilliSeconds(time);
+                        final Long timeInMilliSeconds = trackedLegOfCompetitor.getTimeInMilliSeconds(time);
+                        final double legTime = 1. / 1000. * (timeInMilliSeconds==null?0:timeInMilliSeconds);
                         final Speed avgSpeed = trackedLegOfCompetitor.getAverageSpeedOverGround(time);
                         final Distance distanceSailed = trackedLegOfCompetitor.getDistanceTraveled(time);
 
diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java
index ddc821e1c34..cb0bb8f66f5 100644
--- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java
+++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java
@@ -74,7 +74,8 @@ public class RankPerLeg extends Action {
                             posGL = legRank - previousLeg.getTrackedLeg(competitor).getRank(time);
                         }
                         final Double gapToLeader = trackedLegOfCompetitor.getGapToLeaderInSeconds(time);
-                        final double legTime = 1. / 1000. * trackedLegOfCompetitor.getTimeInMilliSeconds(time);
+                        final Long timeInMilliSeconds = trackedLegOfCompetitor.getTimeInMilliSeconds(time);
+                        final double legTime = 1. / 1000. * (timeInMilliSeconds==null?0:timeInMilliSeconds);
                         final Speed avgSpeed = trackedLegOfCompetitor.getAverageSpeedOverGround(time);
                         final Distance distanceSailed = trackedLegOfCompetitor.getDistanceTraveled(time);
 
diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java
index f6025701ef4..de27be94991 100644
--- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java
+++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java
@@ -79,7 +79,8 @@ public class RankPerLeg2 extends Action {
                                 posGL = legRank - previousLeg.getTrackedLeg(competitor).getRank(time);
                             }
                             final Double gapToLeader = trackedLegOfCompetitor.getGapToLeaderInSeconds(time);
-                            final double legTime = 1. / 1000. * trackedLegOfCompetitor.getTimeInMilliSeconds(time);
+                            final Long timeInMilliSeconds = trackedLegOfCompetitor.getTimeInMilliSeconds(time);
+                            final double legTime = 1. / 1000. * (timeInMilliSeconds==null?0:timeInMilliSeconds);
                             final Speed avgSpeed = trackedLegOfCompetitor.getAverageSpeedOverGround(time);
                             final Distance distanceSailed = trackedLegOfCompetitor.getDistanceTraveled(time);