Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs
===================================================================
diff -u -r25ec12515bc09ad7c194bb970edddd4593ed60cd -r2f9d8396ab89c4826d9fcd1bf1f8daa0a8c13be3
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs	(.../DuneErosionDataSynchronizationService.cs)	(revision 25ec12515bc09ad7c194bb970edddd4593ed60cd)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs	(.../DuneErosionDataSynchronizationService.cs)	(revision 2f9d8396ab89c4826d9fcd1bf1f8daa0a8c13be3)
@@ -67,26 +67,25 @@
                 return;
             }
 
-            var correspondingDuneLocations = new List<DuneLocation>();
-            foreach (ReadDuneLocation readDuneLocation in duneLocations)
-            {
-                HydraulicBoundaryLocation correspondingHydraulicBoundaryLocation = hydraulicBoundaryLocations
-                    .FirstOrDefault(hbl => hbl.Name == readDuneLocation.Name);
+            var duneLocationsToSet = new List<DuneLocation>();
 
-                if (correspondingHydraulicBoundaryLocation != null)
+            Dictionary<string, ReadDuneLocation> readDuneLocationsLookup = duneLocations.ToDictionary(rdl => rdl.Name, rdl => rdl);
+
+            foreach (HydraulicBoundaryLocation hydraulicBoundaryLocation in hydraulicBoundaryLocations)
+            {
+                if (readDuneLocationsLookup.TryGetValue(hydraulicBoundaryLocation.Name, out ReadDuneLocation correspondingReadDuneLocation))
                 {
-                    var duneLocation = new DuneLocation(readDuneLocation.Name,
-                                                        correspondingHydraulicBoundaryLocation,
-                                                        new DuneLocation.ConstructionProperties
-                                                        {
-                                                            CoastalAreaId = readDuneLocation.CoastalAreaId,
-                                                            Offset = readDuneLocation.Offset
-                                                        });
-                    correspondingDuneLocations.Add(duneLocation);
+                    duneLocationsToSet.Add(new DuneLocation(hydraulicBoundaryLocation.Name,
+                                                            hydraulicBoundaryLocation,
+                                                            new DuneLocation.ConstructionProperties
+                                                            {
+                                                                CoastalAreaId = correspondingReadDuneLocation.CoastalAreaId,
+                                                                Offset = correspondingReadDuneLocation.Offset
+                                                            }));
                 }
             }
 
-            failureMechanism.SetDuneLocations(correspondingDuneLocations);
+            failureMechanism.SetDuneLocations(duneLocationsToSet);
         }
 
         /// <summary>