Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -raa45215a1f556ae8b9abbad2d5e469aa38292213 -r7d2d3b08afed372bd36d3ab1386274bbaf351237
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision aa45215a1f556ae8b9abbad2d5e469aa38292213)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 7d2d3b08afed372bd36d3ab1386274bbaf351237)
@@ -305,16 +305,11 @@
             {
                 FmSectionAssemblyDirectResult simpleAssemblyResult =
                     FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(simpleAssembly);
-                FmSectionAssemblyDirectResult detailedAssemblyResult;
-                FmSectionAssemblyDirectResult tailorMadeAssemblyResult;
+                FmSectionAssemblyDirectResult detailedAssemblyResult = null;
+                FmSectionAssemblyDirectResult tailorMadeAssemblyResult = null;
 
-                if (simpleAssemblyResult.Result == EFmSectionCategory.NotApplicable || simpleAssemblyResult.Result == EFmSectionCategory.Iv)
+                if (simpleAssemblyResult.Result != EFmSectionCategory.NotApplicable && simpleAssemblyResult.Result != EFmSectionCategory.Iv)
                 {
-                    detailedAssemblyResult = new FmSectionAssemblyDirectResult(EFmSectionCategory.Gr);
-                    tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(EFmSectionCategory.Gr);
-                }
-                else
-                {
                     detailedAssemblyResult = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(detailedAssembly);
                     tailorMadeAssemblyResult = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(tailorMadeAssembly);
                 }
@@ -341,16 +336,11 @@
             {
                 FmSectionAssemblyDirectResult simpleAssemblyResult =
                     FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(simpleAssembly);
-                FmSectionAssemblyDirectResult detailedAssemblyResult;
-                FmSectionAssemblyDirectResult tailorMadeAssemblyResult;
+                FmSectionAssemblyDirectResult detailedAssemblyResult = null;
+                FmSectionAssemblyDirectResult tailorMadeAssemblyResult = null;
 
-                if (simpleAssemblyResult.Result == EFmSectionCategory.NotApplicable || simpleAssemblyResult.Result == EFmSectionCategory.Iv)
+                if (simpleAssemblyResult.Result != EFmSectionCategory.NotApplicable && simpleAssemblyResult.Result != EFmSectionCategory.Iv)
                 {
-                    detailedAssemblyResult = new FmSectionAssemblyDirectResult(EFmSectionCategory.Gr);
-                    tailorMadeAssemblyResult = new FmSectionAssemblyDirectResult(EFmSectionCategory.Gr);
-                }
-                else
-                {
                     detailedAssemblyResult = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(detailedAssembly);
                     tailorMadeAssemblyResult = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult(tailorMadeAssembly);
                 }
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -raa45215a1f556ae8b9abbad2d5e469aa38292213 -r7d2d3b08afed372bd36d3ab1386274bbaf351237
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision aa45215a1f556ae8b9abbad2d5e469aa38292213)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 7d2d3b08afed372bd36d3ab1386274bbaf351237)
@@ -1804,10 +1804,8 @@
 
                 // Assert
                 AssertAssembly(simpleAssembly, kernel.SimpleAssessmentResultInput);
-                AssertAssembly(new FailureMechanismSectionAssembly(double.NaN, FailureMechanismSectionAssemblyCategoryGroup.None),
-                               kernel.DetailedAssessmentResultInput);
-                AssertAssembly(new FailureMechanismSectionAssembly(double.NaN, FailureMechanismSectionAssemblyCategoryGroup.None),
-                               kernel.TailorMadeAssessmentResultInput);
+                Assert.IsNull(kernel.DetailedAssessmentResultInput);
+                Assert.IsNull(kernel.TailorMadeAssessmentResultInput);
             }
         }
 
@@ -1970,8 +1968,8 @@
 
                 // Assert
                 Assert.AreEqual(simpleAssembly, GetGroup(kernel.SimpleAssessmentResultInput.Result));
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, GetGroup(kernel.DetailedAssessmentResultInput.Result));
-                Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, GetGroup(kernel.TailorMadeAssessmentResultInput.Result));
+                Assert.IsNull(kernel.DetailedAssessmentResultInput);
+                Assert.IsNull(kernel.TailorMadeAssessmentResultInput);
             }
         }
 
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs
===================================================================
diff -u -r906fbb3b284f9b3540d20348f73fc105e9b33dc3 -r7d2d3b08afed372bd36d3ab1386274bbaf351237
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 906fbb3b284f9b3540d20348f73fc105e9b33dc3)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 7d2d3b08afed372bd36d3ab1386274bbaf351237)
@@ -67,8 +67,6 @@
             // Assert
             Assert.AreEqual(signalingNorm, kernel.SignalingNorm);
             Assert.AreEqual(lowerLimitNorm, kernel.LowerLimitNorm);
-
-            // Assert
             Assert.IsTrue(kernel.Calculated);
         }