Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs
===================================================================
diff -u -r8d246ac6328e6e649ff6e78dfe3fac210d789ba0 -r990386c78ced95081f33d9c1d1c5829c080db6b2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs	(.../MacroStabilityInwardsCalculationConfigurationExporter.cs)	(revision 8d246ac6328e6e649ff6e78dfe3fac210d789ba0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs	(.../MacroStabilityInwardsCalculationConfigurationExporter.cs)	(revision 990386c78ced95081f33d9c1d1c5829c080db6b2)
@@ -90,13 +90,13 @@
                 RightGrid = input.RightGrid.ToMacroStabilityInwardsGridConfiguration()
             };
 
-            if (input.HydraulicBoundaryLocation != null)
+            if (input.UseAssessmentLevelManualInput)
             {
-                calculationConfiguration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation.Name;
+                calculationConfiguration.AssessmentLevel = input.AssessmentLevel;
             }
-            else if (input.UseAssessmentLevelManualInput)
+            else if (input.HydraulicBoundaryLocation != null)
             {
-                calculationConfiguration.AssessmentLevel = input.AssessmentLevel;
+                calculationConfiguration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation.Name;
             }
 
             if (input.SurfaceLine != null)
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs
===================================================================
diff -u -r8d246ac6328e6e649ff6e78dfe3fac210d789ba0 -r990386c78ced95081f33d9c1d1c5829c080db6b2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs	(.../MacroStabilityInwardsCalculationConfigurationImporter.cs)	(revision 8d246ac6328e6e649ff6e78dfe3fac210d789ba0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs	(.../MacroStabilityInwardsCalculationConfigurationImporter.cs)	(revision 990386c78ced95081f33d9c1d1c5829c080db6b2)
@@ -68,10 +68,12 @@
             {
                 throw new ArgumentNullException(nameof(availableHydraulicBoundaryLocations));
             }
+
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
+
             this.availableHydraulicBoundaryLocations = availableHydraulicBoundaryLocations;
             this.failureMechanism = failureMechanism;
         }
@@ -107,6 +109,7 @@
                 SetMacroStabilityInwardsLocationInputExtreme(calculationConfiguration.LocationInputExtreme, calculation.InputParameters.LocationInputExtreme);
                 return calculation;
             }
+
             return null;
         }
 
@@ -132,15 +135,15 @@
                 return false;
             }
 
-            if (location != null)
+            if (calculationConfiguration.AssessmentLevel.HasValue)
             {
-                macroStabilityInwardsCalculation.InputParameters.HydraulicBoundaryLocation = location;
-            }
-            else if (calculationConfiguration.AssessmentLevel.HasValue)
-            {
                 macroStabilityInwardsCalculation.InputParameters.UseAssessmentLevelManualInput = true;
                 macroStabilityInwardsCalculation.InputParameters.AssessmentLevel = (RoundedDouble) calculationConfiguration.AssessmentLevel.Value;
             }
+            else if (location != null)
+            {
+                macroStabilityInwardsCalculation.InputParameters.HydraulicBoundaryLocation = location;
+            }
 
             return true;
         }
@@ -574,10 +577,12 @@
             {
                 input.DrainageConstructionPresent = calculationConfiguration.DrainageConstructionPresent.Value;
             }
+
             if (calculationConfiguration.XCoordinateDrainageConstruction.HasValue)
             {
                 input.XCoordinateDrainageConstruction = (RoundedDouble) calculationConfiguration.XCoordinateDrainageConstruction.Value;
             }
+
             if (calculationConfiguration.ZCoordinateDrainageConstruction.HasValue)
             {
                 input.ZCoordinateDrainageConstruction = (RoundedDouble) calculationConfiguration.ZCoordinateDrainageConstruction.Value;
@@ -587,6 +592,7 @@
             {
                 input.MinimumLevelPhreaticLineAtDikeTopRiver = (RoundedDouble) calculationConfiguration.MinimumLevelPhreaticLineAtDikeTopRiver.Value;
             }
+
             if (calculationConfiguration.MinimumLevelPhreaticLineAtDikeTopPolder.HasValue)
             {
                 input.MinimumLevelPhreaticLineAtDikeTopPolder = (RoundedDouble) calculationConfiguration.MinimumLevelPhreaticLineAtDikeTopPolder.Value;
@@ -601,6 +607,7 @@
             {
                 input.PiezometricHeadPhreaticLine2Outwards = (RoundedDouble) calculationConfiguration.PiezometricHeadPhreaticLine2Outwards.Value;
             }
+
             if (calculationConfiguration.PiezometricHeadPhreaticLine2Inwards.HasValue)
             {
                 input.PiezometricHeadPhreaticLine2Inwards = (RoundedDouble) calculationConfiguration.PiezometricHeadPhreaticLine2Inwards.Value;
@@ -610,6 +617,7 @@
             {
                 input.LeakageLengthOutwardsPhreaticLine3 = (RoundedDouble) calculationConfiguration.LeakageLengthOutwardsPhreaticLine3.Value;
             }
+
             if (calculationConfiguration.LeakageLengthInwardsPhreaticLine3.HasValue)
             {
                 input.LeakageLengthInwardsPhreaticLine3 = (RoundedDouble) calculationConfiguration.LeakageLengthInwardsPhreaticLine3.Value;
@@ -619,6 +627,7 @@
             {
                 input.LeakageLengthOutwardsPhreaticLine4 = (RoundedDouble) calculationConfiguration.LeakageLengthOutwardsPhreaticLine4.Value;
             }
+
             if (calculationConfiguration.LeakageLengthInwardsPhreaticLine4.HasValue)
             {
                 input.LeakageLengthInwardsPhreaticLine4 = (RoundedDouble) calculationConfiguration.LeakageLengthInwardsPhreaticLine4.Value;
@@ -628,10 +637,12 @@
             {
                 input.SlipPlaneMinimumDepth = (RoundedDouble) calculationConfiguration.SlipPlaneMinimumDepth.Value;
             }
+
             if (calculationConfiguration.SlipPlaneMinimumLength.HasValue)
             {
                 input.SlipPlaneMinimumLength = (RoundedDouble) calculationConfiguration.SlipPlaneMinimumLength.Value;
             }
+
             if (calculationConfiguration.MaximumSliceWidth.HasValue)
             {
                 input.MaximumSliceWidth = (RoundedDouble) calculationConfiguration.MaximumSliceWidth.Value;
@@ -651,6 +662,7 @@
             {
                 input.ZoneBoundaryLeft = (RoundedDouble) calculationConfiguration.ZoneBoundaryLeft.Value;
             }
+
             if (calculationConfiguration.ZoneBoundaryRight.HasValue)
             {
                 input.ZoneBoundaryRight = (RoundedDouble) calculationConfiguration.ZoneBoundaryRight.Value;
@@ -744,22 +756,27 @@
             {
                 locationInput.WaterLevelPolder = (RoundedDouble) configurationLocationInput.WaterLevelPolder.Value;
             }
+
             if (configurationLocationInput.UseDefaultOffsets.HasValue)
             {
                 locationInput.UseDefaultOffsets = configurationLocationInput.UseDefaultOffsets.Value;
             }
+
             if (configurationLocationInput.PhreaticLineOffsetBelowDikeTopAtRiver.HasValue)
             {
                 locationInput.PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) configurationLocationInput.PhreaticLineOffsetBelowDikeTopAtRiver.Value;
             }
+
             if (configurationLocationInput.PhreaticLineOffsetBelowDikeTopAtPolder.HasValue)
             {
                 locationInput.PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) configurationLocationInput.PhreaticLineOffsetBelowDikeTopAtPolder.Value;
             }
+
             if (configurationLocationInput.PhreaticLineOffsetBelowShoulderBaseInside.HasValue)
             {
                 locationInput.PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) configurationLocationInput.PhreaticLineOffsetBelowShoulderBaseInside.Value;
             }
+
             if (configurationLocationInput.PhreaticLineOffsetBelowDikeToeAtPolder.HasValue)
             {
                 locationInput.PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) configurationLocationInput.PhreaticLineOffsetBelowDikeToeAtPolder.Value;