diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
index 90e8a67bb5f..00d5065aa3c 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
@@ -213,6 +213,9 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT
 
     private <ItemT extends WithID, FixT extends GPSFix> boolean hasMappingAlreadyBeenLoaded(
             DeviceMapping<ItemT> newMapping, List<DeviceMapping<ItemT>> oldMappings) {
+        if (oldMappings == null) {
+            return false;
+        }
         for (DeviceMapping<ItemT> oldMapping : oldMappings) {
             if (newMapping.getDevice() == oldMapping.getDevice()
                     && newMapping.getTimeRange().liesWithin(oldMapping.getTimeRange())) {