Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingCalculationConfigurationImporter.cs
===================================================================
diff -u -r335523a40d190e19b1061804de21c28f74140f52 -r1127011aaf7ba5f521e709a7ab54d212e1a18fe3
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingCalculationConfigurationImporter.cs	(.../PipingCalculationConfigurationImporter.cs)	(revision 335523a40d190e19b1061804de21c28f74140f52)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingCalculationConfigurationImporter.cs	(.../PipingCalculationConfigurationImporter.cs)	(revision 1127011aaf7ba5f521e709a7ab54d212e1a18fe3)
@@ -108,23 +108,20 @@
         /// set which is not available in <see cref="availableHydraulicBoundaryLocations"/>, <c>true</c> otherwise.</returns>
         private bool TryReadHydraulicBoundaryData(ReadPipingCalculation readCalculation, PipingCalculationScenario pipingCalculation)
         {
-            if (readCalculation.HydraulicBoundaryLocation != null)
-            {
-                HydraulicBoundaryLocation location = availableHydraulicBoundaryLocations
-                    .FirstOrDefault(l => l.Name == readCalculation.HydraulicBoundaryLocation);
+            HydraulicBoundaryLocation location;
 
-                if (location == null)
-                {
-                    Log.LogCalculationConversionError(string.Format(
-                              RingtoetsCommonIOResources.CalculationConfigurationImporter_ReadHydraulicBoundaryLocation_HydraulicBoundaryLocation_0_does_not_exist,
-                              readCalculation.HydraulicBoundaryLocation),
-                          pipingCalculation.Name);
-                    return false;
-                }
+            bool locationRead = TryReadHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocation, readCalculation.Name, availableHydraulicBoundaryLocations, out location);
 
+            if (!locationRead)
+            {
+                return false;
+            }
+
+            if (location != null)
+            {
                 pipingCalculation.InputParameters.HydraulicBoundaryLocation = location;
             }
-            else if (readCalculation.AssessmentLevel.HasValue)
+            else if(readCalculation.AssessmentLevel.HasValue)
             {
                 pipingCalculation.InputParameters.UseAssessmentLevelManualInput = true;
                 pipingCalculation.InputParameters.AssessmentLevel = (RoundedDouble) readCalculation.AssessmentLevel.Value;