diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
index f21b5f7c014..86c1e48e86b 100755
--- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
+++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
@@ -662,7 +662,9 @@ public class TracTracRaceTrackerImpl extends AbstractRaceTrackerImpl
     @Override
     public void raceNotLoaded(String reason) throws MalformedURLException, IOException, InterruptedException {
         logger.severe("Race for tracker "+this+" with ID "+getID()+" did not load: "+reason+". Stopping tracker.");
-        trackedRegattaRegistry.stopTracking(regatta, race);
+        if (race != null) {
+            trackedRegattaRegistry.stopTracking(regatta, race);
+        }
     }
 
     @Override