diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java
index 807ef0248e3..b95f34c130b 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java
@@ -34,7 +34,10 @@ public class CourseBasedWindTrackImpl extends WindTrackImpl {
             TimePoint startTime = trackedRace.getStart();
             if (startTime != null) {
                 result = new ArrayListNavigableSet<Wind>(1, WindComparator.INSTANCE);
-                result.add(trackedRace.getDirectionFromStartToNextMark(startTime));
+                final Wind directionFromStartToNextMark = trackedRace.getDirectionFromStartToNextMark(startTime);
+                if (directionFromStartToNextMark != null) {
+                    result.add(directionFromStartToNextMark);
+                }
             } else {
                 result = empty;
             }