Index: DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r3736 -r3737
--- DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../DamEngine 19.3 wrong/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs)	(revision 3736)
+++ DamEngine/branches/DamEngine 19.3/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../DamEngine 19.3/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs)	(revision 3737)
@@ -137,45 +137,18 @@
             foreach (var inputSensorLocation in inputSensorData.SensorLocations)
             {
                 var sensorLocation = new Data.General.Sensors.SensorLocation();
-                try
-                {
-                    sensorLocation.Location = locations.First(l => l.Name.Equals(inputSensorLocation.LocationId));
-                }
-                catch (Exception e)
-                {
-                    // location may not have been selected for calculation in which case this location can not be found for this sensor. Just do not add the sensorlocation
-                    sensorLocation = null;
-                }
-
-                if (sensorLocation != null)
-                {
-                    sensorLocation.Location.SensorLocation = sensorLocation;
-                    sensorLocation.SensorGroup =
-                        sensorData.SensorGroups.First(sg => sg.ID.Equals(inputSensorLocation.GroupId));
-                    sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation
-                            .SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
-                    sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation
-                            .SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
-                    sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation
-                            .SourceTypePl1PlLineOffsetBelowDikeTopAtRiver);
-                    sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation
-                            .SourceTypePl1PlLineOffsetBelowShoulderBaseInside);
-                    sensorLocation.SourceTypePl1WaterLevelAtPolder =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation
-                            .SourceTypePl1WaterLevelAtPolder);
-                    sensorLocation.SourceTypePl1WaterLevelAtRiver =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation
-                            .SourceTypePl1WaterLevelAtRiver);
-                    sensorLocation.SourceTypePl3 =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl3);
-                    sensorLocation.SourceTypePl4 =
-                        ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl4);
-                    sensorData.SensorLocations.Add(sensorLocation);
-                }
+                sensorLocation.Location = locations.First(l => l.Name.Equals(inputSensorLocation.LocationId));
+                sensorLocation.Location.SensorLocation = sensorLocation;
+                sensorLocation.SensorGroup = sensorData.SensorGroups.First(sg => sg.ID.Equals(inputSensorLocation.GroupId));
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver);
+                sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside);
+                sensorLocation.SourceTypePl1WaterLevelAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1WaterLevelAtPolder);
+                sensorLocation.SourceTypePl1WaterLevelAtRiver = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1WaterLevelAtRiver);
+                sensorLocation.SourceTypePl3 = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl3);
+                sensorLocation.SourceTypePl4 = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl4);
+                sensorData.SensorLocations.Add(sensorLocation);
             }
         }
 
@@ -237,7 +210,7 @@
             List<LogMessage> validationMessages = new List<LogMessage>();
             if (inputAquiferSoils != null)
             {
-                soilList.AquiferDictionary.Clear();
+                soilList.AquiferDictionary = new Dictionary<string, bool>();
                 foreach (InputAquiferSoil aquiferSoil in inputAquiferSoils)
                 {
                     var soil = soilList.GetSoilByName(aquiferSoil.Soilname);
@@ -527,9 +500,11 @@
                 var waternetOptions = inputLocation.WaternetOptions;
                 location.ModelParametersForPlLines.PlLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod);
                 location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure);
+                location.PolderLevel = waternetOptions.PolderLevel;
                 location.ModelParametersForPlLines.DampingFactorPl3 = waternetOptions.DampingFactorPl3;
                 location.ModelParametersForPlLines.DampingFactorPl4 = waternetOptions.DampingFactorPl4;
                 location.ModelParametersForPlLines.PenetrationLength = waternetOptions.PenetrationLength;
+                location.HeadPl2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null);
                 location.DikeSoilScenario = ConversionHelper.ConvertToDikeSoilScenario(waternetOptions.DikeSoilScenario);
                 location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor;
                 
@@ -583,7 +558,6 @@
                         var designScenario = new DesignScenario();
                         var inputLocationDesignScenario = inputLocation.DesignScenarios[j];
                         designScenario.LocationScenarioID = inputLocationDesignScenario.Id;
-                        designScenario.PolderLevel = inputLocationDesignScenario.PolderLevel;
                         designScenario.RiverLevel = inputLocationDesignScenario.RiverLevel;
                         designScenario.RiverLevelLow = (inputLocationDesignScenario.RiverLevelLowSpecified ? (double?)inputLocationDesignScenario.RiverLevelLow : null);
                         designScenario.DikeTableHeight = (inputLocationDesignScenario.DikeTableHeightSpecified ? (double?)inputLocationDesignScenario.DikeTableHeight : null);
@@ -595,7 +569,6 @@
                         designScenario.PlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddle;
                         designScenario.UsePlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified;
                         designScenario.PlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrest;
-                        designScenario.HeadPl2 = (inputLocationDesignScenario.HeadPl2Specified ? (double?)inputLocationDesignScenario.HeadPl2 : null);
                         designScenario.HeadPl3 = (inputLocationDesignScenario.HeadPl3Specified ? (double?)inputLocationDesignScenario.HeadPl3 : null);
                         designScenario.HeadPl4 = (inputLocationDesignScenario.HeadPl4Specified ? (double?)inputLocationDesignScenario.HeadPl4 : null);
                         designScenario.UpliftCriterionStability = inputLocationDesignScenario.UpliftCriterionStability;