Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs
===================================================================
diff -u -rca9e457de56679e8bdbba7953235b02543cbfac3 -r145d8dd698770e60f0010e922473c759c0631aa2
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision ca9e457de56679e8bdbba7953235b02543cbfac3)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision 145d8dd698770e60f0010e922473c759c0631aa2)
@@ -49,8 +49,6 @@
         private readonly Location location;
         private readonly WaternetCreator waternetCreator;
         private IList<Soil> soilModel;
-        private SurfaceLine2 surfaceLine;
-        private SoilProfile2D soilProfile;
 
         /// <summary>
         /// Creates a new instance of <see cref="WaternetKernelWrapper"/>.
@@ -76,13 +74,11 @@
 
         public void SetSoilProfile(SoilProfile2D soilProfile)
         {
-            this.soilProfile = soilProfile;
             location.SoilProfile2D = soilProfile;
         }
 
         public void SetSurfaceLine(SurfaceLine2 surfaceLine)
         {
-            this.surfaceLine = surfaceLine;
             location.Surfaceline = surfaceLine;
         }
 
@@ -97,13 +93,13 @@
 
             try
             {
+                WriteXmlFile();
+
                 waternetCreator.UpdateWaternet(Waternet, location);
 
                 ReadLogMessages(waternetCreator.LogMessages);
 
                 SynchronizeWaternetLinePoints();
-
-                WriteXmlFile();
             }
             catch (Exception e) when (!(e is WaternetKernelWrapperException))
             {
@@ -147,13 +143,11 @@
                             {
                                 location
                             },
-                            SurfaceLine = surfaceLine
+                            SurfaceLine = location.Surfaceline
                         }
                     }
                 }
             };
-            location.Surfaceline = surfaceLine;
-            location.SoilProfile2D = soilProfile;
             model.StabilityModel.Soils.AddRange(soilModel);
 
             FullInputModelType fullInputModel = FillXmlInputFromDomain.CreateStabilityInput(model);