diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/CompetitorChangeReceiver.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/CompetitorChangeReceiver.java
index eb3a495d73f..0fa1733396b 100755
--- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/CompetitorChangeReceiver.java
+++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/CompetitorChangeReceiver.java
@@ -94,15 +94,20 @@ implements OfficialCompetitorUpdateProvider {
     @Override
     protected void handleEvent(Triple<IRaceCompetitor, Void, Void> event) {
         final IRace race = event.getA().getRace();
-        final DynamicTrackedRace trackedRace = getTrackedRace(race);
-        if (trackedRace != null) {
-            final IRaceCompetitor raceCompetitor = event.getA();
-            if (reconciler != null && raceCompetitor != null) {
-                reconciler.reconcileCompetitorStatus(raceCompetitor, trackedRace);
-            }
+        if (race == null) {
+            logger.warning("Received a competitor update for a null race for competitor "+event.getA().getCompetitor().getName()+
+                    " in "+this+". Ignoring.");
         } else {
-            logger.warning("Couldn't find tracked race for race " + race.getName()
-                    + ". Dropping competitor change event " + event);
+            final DynamicTrackedRace trackedRace = getTrackedRace(race);
+            if (trackedRace != null) {
+                final IRaceCompetitor raceCompetitor = event.getA();
+                if (reconciler != null && raceCompetitor != null) {
+                    reconciler.reconcileCompetitorStatus(raceCompetitor, trackedRace);
+                }
+            } else {
+                logger.warning("Couldn't find tracked race for race " + race.getName()
+                        + ". Dropping competitor change event " + event);
+            }
         }
     }