Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs
===================================================================
diff -u -r870b9a145e270c1ae1879cfadec7ccbf9fade51d -rfd823765e022710a4649fb2b22d02882bbec3981
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision 870b9a145e270c1ae1879cfadec7ccbf9fade51d)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision fd823765e022710a4649fb2b22d02882bbec3981)
@@ -76,7 +76,7 @@
         /// <summary>
         /// Creates a Waternet kernel.
         /// </summary>
-        /// <param name="location">The location to create the Waternet on.</param>
+        /// <param name="location">The location to create the Waternet for.</param>
         /// <returns>The created <see cref="IWaternetKernel"/>.</returns>
         protected abstract IWaternetKernel CreateWaternetKernel(Location location);
 
@@ -90,8 +90,7 @@
         /// kernel throws a <see cref="WaternetKernelWrapperException"/>.</exception>
         private IWaternetKernel CalculateWaternet()
         {
-            IWaternetKernel waternetKernel = CreateWaternetKernel(WaternetLocationCreator.Create(Input));
-            SetInputOnKernel(waternetKernel);
+            IWaternetKernel waternetKernel = GetWaternetKernel();
 
             try
             {
@@ -105,6 +104,13 @@
             return waternetKernel;
         }
 
+        private IWaternetKernel GetWaternetKernel()
+        {
+            IWaternetKernel waternetKernel = CreateWaternetKernel(WaternetLocationCreator.Create(Input));
+            SetInputOnKernel(waternetKernel);
+            return waternetKernel;
+        }
+
         private void SetInputOnKernel(IWaternetKernel waternetKernel)
         {
             LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(Input.SoilProfile, out IDictionary<SoilLayer, LayerWithSoil> layerLookup);
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs
===================================================================
diff -u -r870b9a145e270c1ae1879cfadec7ccbf9fade51d -rfd823765e022710a4649fb2b22d02882bbec3981
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision 870b9a145e270c1ae1879cfadec7ccbf9fade51d)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs	(.../WaternetKernelWrapper.cs)	(revision fd823765e022710a4649fb2b22d02882bbec3981)
@@ -39,8 +39,18 @@
         private readonly Location location;
         private readonly WaternetCreator waternetCreator;
 
-        internal WaternetKernelWrapper(Location location, string waternetName)
+        /// <summary>
+        /// Creates a new instance of <see cref="WaternetKernelWrapper"/>.
+        /// </summary>
+        /// <param name="location">The <see cref="Location"/> to use.</param>
+        /// <param name="waternetName">The name of the <see cref="Waternet"/>.</param>
+        public WaternetKernelWrapper(Location location, string waternetName)
         {
+            if (location == null)
+            {
+                throw new ArgumentNullException(nameof(location));
+            }
+
             this.location = location;
             Waternet = new WtiStabilityWaternet
             {