Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs
===================================================================
diff -u -r597dfc8dd0177c9739b61f0fc6a983306b0d3aff -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreator.cs)	(revision 597dfc8dd0177c9739b61f0fc6a983306b0d3aff)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Creators/SerializableFailureMechanismSectionAssemblyResultCreator.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreator.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.IO.Model.DataTypes;
 using Ringtoets.AssemblyTool.IO.Model.Enums;
 using Ringtoets.Integration.IO.Assembly;
@@ -48,6 +49,12 @@
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
+            if (sectionResult.AssemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
+                                                                             assessmentType);
+            }
+
             return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
                                                                          assessmentType,
                                                                          SerializableFailureMechanismSectionCategoryGroupCreator.Create(sectionResult.AssemblyCategory));
@@ -70,6 +77,12 @@
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
+            if (sectionResult.AssemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
+                                                                             assessmentType);
+            }
+
             return new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod),
                                                                          assessmentType,
                                                                          SerializableFailureMechanismSectionCategoryGroupCreator.Create(sectionResult.AssemblyCategory),
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs
===================================================================
diff -u -r32569b8b17f24007bc536331d8988d9369a661d4 -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs	(.../AggregatedSerializableFailureMechanismCreatorTest.cs)	(revision 32569b8b17f24007bc536331d8988d9369a661d4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs	(.../AggregatedSerializableFailureMechanismCreatorTest.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
@@ -493,27 +493,15 @@
         private static ExportableSectionAssemblyResult CreateSectionAssemblyResult(int seed)
         {
             var random = new Random(seed);
-            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
-            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
-            }
-
             return new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                       assemblyCategory);
+                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
         }
 
         private static ExportableSectionAssemblyResultWithProbability CreateSectionAssemblyResultWithProbability(int seed)
         {
             var random = new Random(seed);
-            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
-            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
-            }
-
             return new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                      assemblyCategory,
+                                                                      random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>(),
                                                                       random.NextDouble());
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs
===================================================================
diff -u -r32569b8b17f24007bc536331d8988d9369a661d4 -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs	(.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs)	(revision 32569b8b17f24007bc536331d8988d9369a661d4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs	(.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
@@ -405,27 +405,15 @@
         private static ExportableSectionAssemblyResult CreateSectionAssemblyResult(int seed)
         {
             var random = new Random(seed);
-            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
-            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
-            }
-
             return new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                       assemblyCategory);
+                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
         }
 
         private static ExportableSectionAssemblyResultWithProbability CreateSectionAssemblyResultWithProbability(int seed)
         {
             var random = new Random(seed);
-            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
-            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
-            }
-
             return new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                                      assemblyCategory,
+                                                                      random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>(),
                                                                       random.NextDouble());
         }
     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs
===================================================================
diff -u -rc16772f88ccd57d80eb875838757cbbb49f92f85 -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision c16772f88ccd57d80eb875838757cbbb49f92f85)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
@@ -226,14 +226,8 @@
         private static ExportableSectionAssemblyResult CreateSectionAssemblyResult()
         {
             var random = new Random(30);
-            var assemblyCategory = random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
-            if (assemblyCategory == FailureMechanismSectionAssemblyCategoryGroup.None)
-            {
-                assemblyCategory = FailureMechanismSectionAssemblyCategoryGroup.IIIv;
-            }
-
             return new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
-                                                       assemblyCategory);
+                                                       random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
         }
 
         #endregion
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs
===================================================================
diff -u -r597dfc8dd0177c9739b61f0fc6a983306b0d3aff -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs)	(revision 597dfc8dd0177c9739b61f0fc6a983306b0d3aff)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs	(.../SerializableFailureMechanismSectionAssemblyResultCreatorTest.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
@@ -22,11 +22,11 @@
 using System;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.IO.Model.DataTypes;
 using Ringtoets.AssemblyTool.IO.Model.Enums;
 using Ringtoets.Integration.IO.Assembly;
 using Ringtoets.Integration.IO.Creators;
-using Ringtoets.Integration.IO.TestUtil;
 
 namespace Ringtoets.Integration.IO.Test.Creators
 {
@@ -48,11 +48,13 @@
         }
 
         [Test]
-        public void Create_WithExportableSectionAssemblyResult_ReturnsSerializableFailureMechanismAssemblyResult()
+        public void Create_WithExportableSectionAssemblyResultAndCategory_ReturnsSerializableFailureMechanismAssemblyResult()
         {
             // Setup
-            var assessmentType = new Random(21).NextEnumValue<SerializableAssessmentType>();
-            ExportableSectionAssemblyResult sectionResult = ExportableSectionAssemblyResultTestFactory.CreateSectionAssemblyResult();
+            var random = new Random(21);
+            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
+            var sectionResult = new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
+                                                                    FailureMechanismSectionAssemblyCategoryGroup.IIIv);
 
             // Call
             SerializableFailureMechanismSectionAssemblyResult serializableResult =
@@ -67,6 +69,27 @@
         }
 
         [Test]
+        public void Create_WithExportableSectionAssemblyResultAndCategoryNone_ReturnsSerializableFailureMechanismAssemblyResult()
+        {
+            // Setup
+            var random = new Random(21);
+            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
+            var sectionResult = new ExportableSectionAssemblyResult(random.NextEnumValue<ExportableAssemblyMethod>(),
+                                                                    FailureMechanismSectionAssemblyCategoryGroup.None);
+
+            // Call
+            SerializableFailureMechanismSectionAssemblyResult serializableResult =
+                SerializableFailureMechanismSectionAssemblyResultCreator.Create(assessmentType, sectionResult);
+
+            // Assert
+            Assert.AreEqual(assessmentType, serializableResult.AssessmentType);
+
+            Assert.AreEqual(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod), serializableResult.AssemblyMethod);
+            Assert.IsNull(serializableResult.CategoryGroup);
+            Assert.IsNull(serializableResult.Probability);
+        }
+
+        [Test]
         public void CreateWithExportableSectionAssemblyResultWithProbability_SectionResultNull_ThrowsArgumentNullException()
         {
             // Setup
@@ -82,11 +105,14 @@
         }
 
         [Test]
-        public void Create_WithExportableSectionAssemblyResultWithProbability_ReturnsSerializableFailureMechanismAssemblyResult()
+        public void Create_WithExportableSectionAssemblyResultWithProbabilityAndCategory_ReturnsSerializableFailureMechanismAssemblyResult()
         {
             // Setup
-            var assessmentType = new Random(21).NextEnumValue<SerializableAssessmentType>();
-            ExportableSectionAssemblyResultWithProbability sectionResult = ExportableSectionAssemblyResultTestFactory.CreateSectionAssemblyResultWithProbability();
+            var random = new Random(21);
+            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
+            var sectionResult = new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
+                                                                                   FailureMechanismSectionAssemblyCategoryGroup.IIIv,
+                                                                                   random.NextDouble());
 
             // Call
             SerializableFailureMechanismSectionAssemblyResult serializableResult =
@@ -99,5 +125,27 @@
             Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(sectionResult.AssemblyCategory), serializableResult.CategoryGroup);
             Assert.AreEqual(sectionResult.Probability, serializableResult.Probability);
         }
+
+        [Test]
+        public void Create_WithExportableSectionAssemblyResultWithProbabilityAndCategoryNone_ReturnsSerializableFailureMechanismAssemblyResult()
+        {
+            // Setup
+            var random = new Random(21);
+            var assessmentType = random.NextEnumValue<SerializableAssessmentType>();
+            var sectionResult = new ExportableSectionAssemblyResultWithProbability(random.NextEnumValue<ExportableAssemblyMethod>(),
+                                                                                   FailureMechanismSectionAssemblyCategoryGroup.None,
+                                                                                   random.NextDouble());
+
+            // Call
+            SerializableFailureMechanismSectionAssemblyResult serializableResult =
+                SerializableFailureMechanismSectionAssemblyResultCreator.Create(assessmentType, sectionResult);
+
+            // Assert
+            Assert.AreEqual(assessmentType, serializableResult.AssessmentType);
+
+            Assert.AreEqual(SerializableAssemblyMethodCreator.Create(sectionResult.AssemblyMethod), serializableResult.AssemblyMethod);
+            Assert.IsNull(serializableResult.CategoryGroup);
+            Assert.IsNull(serializableResult.Probability);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs
===================================================================
diff -u -r18de317218ca80545399311fcdbea5ad6b628b2b -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs	(.../SerializableFailureMechanismSectionAssemblyResultTestHelper.cs)	(revision 18de317218ca80545399311fcdbea5ad6b628b2b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.TestUtil/SerializableFailureMechanismSectionAssemblyResultTestHelper.cs	(.../SerializableFailureMechanismSectionAssemblyResultTestHelper.cs)	(revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.IO.Model.DataTypes;
 using Ringtoets.AssemblyTool.IO.Model.Enums;
 using Ringtoets.Integration.IO.Assembly;
@@ -51,12 +52,20 @@
                                                 SerializableAssessmentType expectedAssessmentType,
                                                 SerializableFailureMechanismSectionAssemblyResult actualResult)
         {
-            Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
-                            actualResult.CategoryGroup);
             Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
                             actualResult.AssemblyMethod);
             Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
             Assert.IsNull(actualResult.Probability);
+
+            if (expectedResult.AssemblyCategory != FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
+                                actualResult.CategoryGroup);
+            }
+            else
+            {
+                Assert.IsNull(actualResult.CategoryGroup);
+            }
         }
 
         /// <summary>
@@ -78,12 +87,21 @@
                                                 SerializableAssessmentType expectedAssessmentType,
                                                 SerializableFailureMechanismSectionAssemblyResult actualResult)
         {
-            Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
-                            actualResult.CategoryGroup);
             Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod),
                             actualResult.AssemblyMethod);
             Assert.AreEqual(expectedAssessmentType, actualResult.AssessmentType);
-            Assert.AreEqual(expectedResult.Probability, actualResult.Probability);
+
+            if (expectedResult.AssemblyCategory != FailureMechanismSectionAssemblyCategoryGroup.None)
+            {
+                Assert.AreEqual(SerializableFailureMechanismSectionCategoryGroupCreator.Create(expectedResult.AssemblyCategory),
+                                actualResult.CategoryGroup);
+                Assert.AreEqual(expectedResult.Probability, actualResult.Probability);
+            }
+            else
+            {
+                Assert.IsNull(actualResult.CategoryGroup);
+                Assert.IsNull(actualResult.Probability);
+            }
         }
     }
 }
\ No newline at end of file