Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs
===================================================================
diff -u -r8ab8e38488feea6de520f6d58ec664acb28ee8a1 -raa882371e29e0c3c8c64d4bb31d802b98ca44142
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision 8ab8e38488feea6de520f6d58ec664acb28ee8a1)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs	(.../PipingCalculationService.cs)	(revision aa882371e29e0c3c8c64d4bb31d802b98ca44142)
@@ -86,21 +86,21 @@
                 pipingData.UpliftModelFactor,
                 pipingData.AssessmentLevel,
                 pipingData.PiezometricHeadExit,
-                pipingData.DampingFactorExit.Mean,
-                pipingData.PhreaticLevelExit.Mean,
+                PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(pipingData).GetDesignValue(),
+                PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(pipingData).GetDesignValue(),
                 pipingData.PiezometricHeadPolder,
                 pipingData.CriticalHeaveGradient,
-                pipingData.ThicknessCoverageLayer.Mean,
+                PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(pipingData).GetDesignValue(),
                 pipingData.SellmeijerModelFactor,
                 pipingData.SellmeijerReductionFactor,
-                pipingData.SeepageLength.Mean,
-                pipingData.SandParticlesVolumicWeight.Mean,
+                PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(pipingData).GetDesignValue(),
+                PipingSemiProbabilisticDesignValueFactory.GetSandParticlesVolumicWeight(pipingData).GetDesignValue(),
                 pipingData.WhitesDragCoefficient,
-                pipingData.Diameter70.Mean,
-                pipingData.DarcyPermeability.Mean,
+                PipingSemiProbabilisticDesignValueFactory.GetDiameter70(pipingData).GetDesignValue(),
+                PipingSemiProbabilisticDesignValueFactory.GetDarcyPermeability(pipingData).GetDesignValue(),
                 pipingData.WaterKinematicViscosity,
                 pipingData.Gravity,
-                pipingData.ThicknessAquiferLayer.Mean,
+                PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(pipingData).GetDesignValue(),
                 pipingData.MeanDiameter70,
                 pipingData.BeddingAngle,
                 pipingData.ExitPointXCoordinate,
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs
===================================================================
diff -u -r8ab8e38488feea6de520f6d58ec664acb28ee8a1 -raa882371e29e0c3c8c64d4bb31d802b98ca44142
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs	(.../PipingCalculationInputsNodePresenterTest.cs)	(revision 8ab8e38488feea6de520f6d58ec664acb28ee8a1)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs	(.../PipingCalculationInputsNodePresenterTest.cs)	(revision aa882371e29e0c3c8c64d4bb31d802b98ca44142)
@@ -384,7 +384,7 @@
         public void GivenInvalidPipingData_WhenCalculatingFromContextMenu_ThenPipingDataNotifiesObserversAndLogMessageAdded()
         {
             // Given
-            var expectedValidationMessageCount = 7;
+            var expectedValidationMessageCount = 2; // No surfaceline or soil profile selected for calculation
 
             var observer = mockRepository.StrictMock<IObserver>();
             mockRepository.ReplayAll();
@@ -434,7 +434,7 @@
         public void GivenInvalidPipingData_WhenValidatingFromContextMenu_ThenLogMessageAddedAndNoNotifyObserver()
         {
             // Given
-            var expectedValidationMessageCount = 7;
+            var expectedValidationMessageCount = 2; // No surfaceline or soil profile selected for calculation
             var expectedStatusMessageCount = 2;
             var expectedLogMessageCount = expectedValidationMessageCount + expectedStatusMessageCount;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -raa882371e29e0c3c8c64d4bb31d802b98ca44142
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision aa882371e29e0c3c8c64d4bb31d802b98ca44142)
@@ -89,34 +89,6 @@
         }
 
         [Test]
-        public void Execute_InvalidPipingDataAndInitialized_ErrorLoggedAndOutputNullWithStartAndEnd()
-        {
-            // Setup
-            var validPipingData = PipingDataFactory.CreateCalculationWithValidInput();
-            validPipingData.Diameter70.Mean = 0;
-            validPipingData.DarcyPermeability.Mean = 0;
-            validPipingData.Output = new TestPipingOutput();
-
-            var activity = new PipingCalculationActivity(validPipingData);
-            activity.Initialize();
-
-            // Call
-            Action call = () => activity.Execute();
-
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
-            {
-                var msgs = messages.ToArray();
-                Assert.AreEqual(3, msgs.Length);
-                StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingData.Name), msgs.First());
-                StringAssert.StartsWith("Piping berekening niet gelukt: ", msgs[1]);
-                StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingData.Name), msgs.Last());
-            });
-            Assert.AreEqual(ActivityStatus.Done, activity.Status);
-            Assert.IsNull(validPipingData.Output);
-        }
-
-        [Test]
         public void Execute_ValidPipingDataAndInitialized_PerformPipingCalculationAndLogStartAndEnd()
         {
             // Setup
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r7570b93f301f4503b1c787ecdba215f41eda684a -raa882371e29e0c3c8c64d4bb31d802b98ca44142
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 7570b93f301f4503b1c787ecdba215f41eda684a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision aa882371e29e0c3c8c64d4bb31d802b98ca44142)
@@ -111,22 +111,5 @@
             // Assert
             Assert.AreNotSame(output, validPipingData.Output);
         }
-
-        [Test]
-        public void PerformValidatedCalculation_Diameter70AndAquiferPermeabilityZero_CalculationErrorOutputNull()
-        {
-            // Setup
-            PipingData validPipingData = PipingDataFactory.CreateCalculationWithValidInput();
-            validPipingData.Diameter70.Mean = 0;
-            validPipingData.DarcyPermeability.Mean = 0;
-
-            // Call
-            var isValid = PipingCalculationService.Validate(validPipingData);
-            PipingCalculationService.Calculate(validPipingData);
-
-            // Assert
-            Assert.IsTrue(isValid);
-            Assert.IsNull(validPipingData.Output);
-        }
     }
 }
\ No newline at end of file