Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs
===================================================================
diff -u -rc6996ad66595632f63ed3deedf6fc5494071a405 -r1931dade703dfa14e44d291a232586f1b5b4825f
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision c6996ad66595632f63ed3deedf6fc5494071a405)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision 1931dade703dfa14e44d291a232586f1b5b4825f)
@@ -49,6 +49,8 @@
         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"/>.
@@ -74,11 +76,13 @@
 
         public void SetSoilProfile(SoilProfile2D soilProfile)
         {
+            this.soilProfile = soilProfile;
             location.SoilProfile2D = soilProfile;
         }
 
         public void SetSurfaceLine(SurfaceLine2 surfaceLine)
         {
+            this.surfaceLine = surfaceLine;
             location.Surfaceline = surfaceLine;
         }
 
@@ -93,13 +97,13 @@
 
             try
             {
-                WriteXmlFile();
-
                 waternetCreator.UpdateWaternet(Waternet, location);
 
                 ReadLogMessages(waternetCreator.LogMessages);
 
                 SynchronizeWaternetLinePoints();
+
+                WriteXmlFile();
             }
             catch (Exception e) when (!(e is WaternetKernelWrapperException))
             {
@@ -131,11 +135,13 @@
                             {
                                 location
                             },
-                            SurfaceLine = location.Surfaceline
+                            SurfaceLine = surfaceLine
                         }
                     }
                 }
             };
+            location.Surfaceline = surfaceLine;
+            location.SoilProfile2D = soilProfile;
             model.StabilityModel.Soils.AddRange(soilModel);
 
             FullInputModelType fullInputModel = FillXmlInputFromDomain.CreateStabilityInput(model);