Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r2695 -r2698
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2695)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2698)
@@ -366,9 +366,7 @@
                     switch (currentSpecification.PipingModelType)
                     {
                         case PipingModelType.Bligh:
-                            throw new NotImplementedException();                            
                         case PipingModelType.SellmeijerVnk:
-                            throw new NotImplementedException();
                         case PipingModelType.Sellmeijer4Forces:
                             throw new NotImplementedException();
                         case PipingModelType.Wti2017:
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r2695 -r2698
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 2695)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 2698)
@@ -80,7 +80,6 @@
         [TestCase(PipingModelType.Bligh)]
         [TestCase(PipingModelType.SellmeijerVnk)]
         [TestCase(PipingModelType.Sellmeijer4Forces)]
-        [ExpectedException(typeof(NotImplementedException))]
         public void Run_UsingTestFiles_ButWithUnsupportedPipingModelFails(PipingModelType pipingModel)
         {
             const string calcDir = "TestOperationalGrebbedijk";
@@ -105,7 +104,7 @@
             Assert.IsNotNull(engineInterface.DamProjectData);
             engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping;
             engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel;
-            string outputString = engineInterface.Run();
+            Assert.That(() => engineInterface.Run(), Throws.TypeOf(typeof(NotImplementedException)).With.Message.EqualTo("The method or operation is not implemented."));
         }
 
         [TestCase(PipingModelType.Wti2017)]
@@ -138,8 +137,9 @@
             var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
             Assert.AreEqual(2,output.Results.CalculationMessages.Length);
             Assert.AreEqual(MessageMessageType.Info, output.Results.CalculationMessages[0].MessageType);
+            Assert.AreEqual("There are 2 locations with sensor data", output.Results.CalculationMessages[0].Message1);
             Assert.AreEqual(MessageMessageType.Error, output.Results.CalculationMessages[1].MessageType);
-            Assert.IsTrue(output.Results.CalculationMessages[1].Message1.Contains("Piping"));
+            Assert.AreEqual("No segments with failure mechanism Piping present", output.Results.CalculationMessages[1].Message1);
         }
     }
 }