Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MicrostabilitySectionResultEntityReadExtensions.cs
===================================================================
diff -u -r4503f687155622bb1b19155d27f8e3f9a5842fb0 -r27963fc53c323c7a6b6382bee7d1ded31b6ac3a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MicrostabilitySectionResultEntityReadExtensions.cs	(.../MicrostabilitySectionResultEntityReadExtensions.cs)	(revision 4503f687155622bb1b19155d27f8e3f9a5842fb0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MicrostabilitySectionResultEntityReadExtensions.cs	(.../MicrostabilitySectionResultEntityReadExtensions.cs)	(revision 27963fc53c323c7a6b6382bee7d1ded31b6ac3a0)
@@ -21,7 +21,8 @@
 
 using System;
 using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.AssemblyTool.Data;
+using Ringtoets.Common.Primitives;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
 namespace Application.Ringtoets.Storage.Read
@@ -36,18 +37,28 @@
         /// Reads the <see cref="MicrostabilitySectionResultEntity"/> and use the information to update a 
         /// <see cref="MicrostabilityFailureMechanismSectionResult"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="MicrostabilitySectionResultEntity"/> to create <see cref="MicrostabilityFailureMechanismSectionResult"/> for.</param>
+        /// <param name="entity">The <see cref="MicrostabilitySectionResultEntity"/> used to update the
+        /// <see cref="MicrostabilityFailureMechanismSectionResult"/>.</param>
         /// <param name="sectionResult">The target of the read operation.</param>
         /// <returns>A new <see cref="MicrostabilityFailureMechanismSectionResult"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResult"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         internal static void Read(this MicrostabilitySectionResultEntity entity, MicrostabilityFailureMechanismSectionResult sectionResult)
         {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
             if (sectionResult == null)
             {
                 throw new ArgumentNullException(nameof(sectionResult));
             }
 
-            sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+            sectionResult.SimpleAssessmentResult = (SimpleAssessmentResultType) entity.SimpleAssessmentResult;
+            sectionResult.DetailedAssessmentResult = (DetailedAssessmentResultType) entity.DetailedAssessmentResult;
+            sectionResult.TailorMadeAssessmentResult = (TailorMadeAssessmentResultType) entity.TailorMadeAssessmentResult;
+            sectionResult.UseManualAssemblyCategoryGroup = Convert.ToBoolean(entity.UseManualAssemblyCategoryGroup);
+            sectionResult.ManualAssemblyCategoryGroup = (FailureMechanismSectionAssemblyCategoryGroup) entity.TailorMadeAssessmentResult;
         }
     }
 }
\ No newline at end of file