diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java
index e5f86a6a9ba..24fedee1fee 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateChooserImpl.java
@@ -133,14 +133,16 @@ public class CandidateChooserImpl implements CandidateChooser {
     public void setFixedPassing(Competitor c, Integer zeroBasedIndexOfWaypoint, TimePoint t) {
         Candidate fixedCan = new CandidateImpl(zeroBasedIndexOfWaypoint + 1, t, 1, Util.get(race.getRace().getCourse().getWaypoints(), zeroBasedIndexOfWaypoint));
         NavigableSet<Candidate> fixed = fixedPassings.get(c);
-        if (!fixed.add(fixedCan)) {
-            Candidate old = fixed.ceiling(fixedCan);
-            fixed.remove(old);
-            removeCandidates(c, Arrays.asList(old));
-            fixed.add(fixedCan);
+        if (fixed != null) { // can only set the mark passing if the competitor is still part of this race
+            if (!fixed.add(fixedCan)) {
+                Candidate old = fixed.ceiling(fixedCan);
+                fixed.remove(old);
+                removeCandidates(c, Arrays.asList(old));
+                fixed.add(fixedCan);
+            }
+            addCandidates(c, Arrays.asList(fixedCan));
+            findShortestPath(c);
         }
-        addCandidates(c, Arrays.asList(fixedCan));
-        findShortestPath(c);
     }
 
     @Override
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java
index 7d290ed6968..4010792eb94 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/EditMarkPassingsPanel.java
@@ -301,14 +301,14 @@ public class EditMarkPassingsPanel extends AbsolutePanel implements Component<Ab
     }
 
     private void processCompetitorSelectionChange(boolean visible) {
-            waypointSelectionModel.clear();
-            if (visible && Util.size(competitorSelectionModel.getSelectedCompetitors()) == 1) {
-                selectCompetitorLabel.setText("");
-                refillList();
-            } else {
-                disableEditing();
-                selectCompetitorLabel.setText(stringMessages.selectCompetitor());
-            }
+        waypointSelectionModel.clear();
+        if (visible && Util.size(competitorSelectionModel.getSelectedCompetitors()) == 1) {
+            selectCompetitorLabel.setText("");
+            refillList();
+        } else {
+            disableEditing();
+            selectCompetitorLabel.setText(stringMessages.selectCompetitor());
+        }
     }
 
     private void disableEditing() {