Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r6216 -r6222
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6216)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6222)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Sensors;
@@ -1344,6 +1345,10 @@
     /// <returns>Type of the output object.</returns>
     public static OperationalStaticDataFailureMechanismSystemType ConvertToOutputOperationalFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType)
     {
+        if (failureMechanismSystemType == FailureMechanismSystemType.Piping)
+        {
+            throw new NotImplementedException("Piping is not a valid failure mechanism system type for operational static data.");
+        }
         var translationTable = new Dictionary<FailureMechanismSystemType, OperationalStaticDataFailureMechanismSystemType>
         {
             {
@@ -1353,6 +1358,7 @@
                 FailureMechanismSystemType.StabilityOutside, OperationalStaticDataFailureMechanismSystemType.StabilityOutside
             }
         };
+        var test = translationTable[failureMechanismSystemType];
         return translationTable[failureMechanismSystemType];
     }
     
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r6216 -r6222
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6216)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 6222)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Sensors;
 using Deltares.DamEngine.Data.General.TimeSeries;
@@ -520,4 +521,26 @@
     {
         Assert.That(ConversionHelper.ConvertToInputDataSourceTypeSensors(dataSourceTypeSensors), Is.EqualTo(inputdataSourceTypeSensors));
     }
+    
+    [TestCase(FailureMechanismSystemType.StabilityInside, OperationalStaticDataFailureMechanismSystemType.StabilityInside)]
+    [TestCase(FailureMechanismSystemType.StabilityOutside, OperationalStaticDataFailureMechanismSystemType.StabilityOutside)]
+    public void CanConvertToOutputOperationalFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, OperationalStaticDataFailureMechanismSystemType expectedFailureMechanismSystemType)
+    {
+        Assert.That(ConversionHelper.ConvertToOutputOperationalFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(expectedFailureMechanismSystemType));
+    }
+    
+    [Test]
+    public void CanNotConvertPipingToOutputOperationalFailureMechanismSystemType()
+    {
+        Assert.Throws<NotImplementedException>(() => ConversionHelper.ConvertToOutputOperationalFailureMechanismSystemType(FailureMechanismSystemType.Piping));
+    }
+
+    [TestCase(MStabModelType.Bishop, OperationalStaticDataStabilityModel.Bishop)]    
+    [TestCase(MStabModelType.UpliftVan, OperationalStaticDataStabilityModel.UpliftVan)]    
+    [TestCase(MStabModelType.BishopUpliftVan, OperationalStaticDataStabilityModel.BishopUpliftVan)]    
+    public void CanConvertToOutputOperationalStabilityModel(MStabModelType stabilityModelType, OperationalStaticDataStabilityModel expectedStabilityModel)
+    {
+        Assert.That(ConversionHelper.ConvertToOutputOperationalStabilityModel(stabilityModelType), Is.EqualTo(expectedStabilityModel));
+    }
+    
 }
\ No newline at end of file