Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructureFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r1cd3618f5f8916ef15992d69ec3b447b311c2f72 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructureFailureMechanismCreateExtensions.cs	(.../ClosingStructureFailureMechanismCreateExtensions.cs)	(revision 1cd3618f5f8916ef15992d69ec3b447b311c2f72)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructureFailureMechanismCreateExtensions.cs	(.../ClosingStructureFailureMechanismCreateExtensions.cs)	(revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,8 +20,10 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Application.Ringtoets.Storage.DbContext;
 using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Create
 {
@@ -39,28 +41,18 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="registry"/> is <c>null</c>.</exception>
         internal static FailureMechanismEntity Create(this ClosingStructureFailureMechanism mechanism, PersistenceRegistry registry)
         {
-            if (registry == null)
-            {
-                throw new ArgumentNullException("registry");
-            }
+            var entity = mechanism.Create(FailureMechanismType.ReliabilityClosingOfStructure, registry);
+            AddEntitiesForSectionResults(mechanism.SectionResults, registry);
 
-            var entity = new FailureMechanismEntity
-            {
-                FailureMechanismType = (short) FailureMechanismType.ReliabilityClosingOfStructure,
-                IsRelevant = Convert.ToByte(mechanism.IsRelevant),
-                Comments = mechanism.Comments
-            };
-
-            mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
-            AddEntitiesForSectionResults(mechanism, registry);
-
             registry.Register(entity, mechanism);
             return entity;
         }
 
-        private static void AddEntitiesForSectionResults(ClosingStructureFailureMechanism mechanism, PersistenceRegistry registry)
+        private static void AddEntitiesForSectionResults(
+            IEnumerable<ClosingStructureFailureMechanismSectionResult> sectionResults, 
+            PersistenceRegistry registry)
         {
-            foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+            foreach (var failureMechanismSectionResult in sectionResults)
             {
                 var sectionResultEntity = failureMechanismSectionResult.Create(registry);
                 var section = registry.Get(failureMechanismSectionResult.Section);