Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -re90b8317442c25f95a6264989872d6c451f0a8d3 -r4aa401876359cfa71b88e446bb5e67427b5b4dc7
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision e90b8317442c25f95a6264989872d6c451f0a8d3)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision 4aa401876359cfa71b88e446bb5e67427b5b4dc7)
@@ -52,6 +52,8 @@
 
             switch (input)
             {
+                case SimpleAssessmentResultType.None:
+                    return SimpleCalculationResult.None;
                 case SimpleAssessmentResultType.NotApplicable:
                     return SimpleCalculationResult.NVT;
                 case SimpleAssessmentResultType.ProbabilityNegligible:
@@ -83,6 +85,8 @@
 
             switch (input)
             {
+                case SimpleAssessmentResultValidityOnlyType.None:
+                    return SimpleCalculationResultValidityOnly.None;
                 case SimpleAssessmentResultValidityOnlyType.NotApplicable:
                     return SimpleCalculationResultValidityOnly.NVT;
                 case SimpleAssessmentResultValidityOnlyType.Applicable:
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -re90b8317442c25f95a6264989872d6c451f0a8d3 -r4aa401876359cfa71b88e446bb5e67427b5b4dc7
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision e90b8317442c25f95a6264989872d6c451f0a8d3)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision 4aa401876359cfa71b88e446bb5e67427b5b4dc7)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.ComponentModel;
 using AssemblyTool.Kernel.Data.CalculationResults;
 using Core.Common.TestUtil;
@@ -44,16 +43,7 @@
         }
 
         [Test]
-        public void CreateSimpleCalculationResult_WithResultTypeNone_ThrowNotSupportedException()
-        {
-            // Call
-            TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateSimpleCalculationResult(SimpleAssessmentResultType.None);
-
-            // Assert
-            Assert.Throws<NotSupportedException>(test);
-        }
-
-        [Test]
+        [TestCase(SimpleAssessmentResultType.None, SimpleCalculationResult.None)]
         [TestCase(SimpleAssessmentResultType.NotApplicable, SimpleCalculationResult.NVT)]
         [TestCase(SimpleAssessmentResultType.ProbabilityNegligible, SimpleCalculationResult.FV)]
         [TestCase(SimpleAssessmentResultType.AssessFurther, SimpleCalculationResult.VB)]
@@ -79,16 +69,7 @@
         }
 
         [Test]
-        public void CreateSimplecalclCalculationResultValidityOnly_WithResultTypeNone_ThrowNotSupportedException()
-        {
-            // Call
-            TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateSimplecalclCalculationResultValidityOnly(SimpleAssessmentResultValidityOnlyType.None);
-
-            // Assert
-            Assert.Throws<NotSupportedException>(test);
-        }
-
-        [Test]
+        [TestCase(SimpleAssessmentResultValidityOnlyType.None, SimpleCalculationResultValidityOnly.None)]
         [TestCase(SimpleAssessmentResultValidityOnlyType.NotApplicable, SimpleCalculationResultValidityOnly.NVT)]
         [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable, SimpleCalculationResultValidityOnly.WVT)]
         public void CreateSimplecalclCalculationResultValidityOnly_ValidData_ReturnSimpleCalculationResultValidityOnly(SimpleAssessmentResultValidityOnlyType originalResult,