Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -rb8df616ca911988b921b933bead5f1ef6862d076
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensionsTest.cs	(.../HeightStructuresSectionResultEntityReadExtensionsTest.cs)	(revision b8df616ca911988b921b933bead5f1ef6862d076)
@@ -24,6 +24,7 @@
 using Application.Ringtoets.Storage.Read;
 using Application.Ringtoets.Storage.Read.HeightStructures;
 using Application.Ringtoets.Storage.TestUtil;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
@@ -64,15 +65,13 @@
         }
 
         [Test]
-        [Combinatorial]
-        public void Read_ParameterValues_SectionResultWithParameterValues(
-            [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict,
-                AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState layerOne,
-            [Values(AssessmentLayerTwoAResult.NotCalculated, AssessmentLayerTwoAResult.Failed,
-                AssessmentLayerTwoAResult.Successful)] AssessmentLayerTwoAResult layerTwoA,
-            [Values(0.1, 0.2, null)] double? layerThree)
+        public void Read_ParameterValues_SectionResultWithParameterValues()
         {
             // Setup
+            var random = new Random(21);
+            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
+            double layerThree = random.NextDouble();
+
             var collector = new ReadConversionCollector();
 
             var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
@@ -90,12 +89,39 @@
 
             // Assert
             Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
-            Assert.AreEqual(layerThree ?? double.NaN, sectionResult.AssessmentLayerThree, 1e-6);
-            Assert.IsNotNull(sectionResult);
+            Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
             Assert.IsNull(sectionResult.Calculation);
         }
 
         [Test]
+        public void Read_EntityWithNullValues_SectionResultWithNaNValues()
+        {
+            // Setup
+            var random = new Random(21);
+            var layerOne = random.NextEnumValue<AssessmentLayerOneState>();
+
+            var collector = new ReadConversionCollector();
+
+            var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
+            collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+            var entity = new HeightStructuresSectionResultEntity
+            {
+                LayerOne = Convert.ToByte(layerOne),
+                LayerThree = null,
+                FailureMechanismSectionEntity = failureMechanismSectionEntity
+            };
+            var sectionResult = new StructuresFailureMechanismSectionResult<HeightStructuresInput>(new TestFailureMechanismSection());
+
+            // Call
+            entity.Read(sectionResult, collector);
+
+            // Assert
+            Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+            Assert.IsNaN(sectionResult.AssessmentLayerThree);
+            Assert.IsNull(sectionResult.Calculation);
+        }
+
+        [Test]
         public void Read_CalculationEntitySet_ReturnHeightStructuresSectionResultWithCalculation()
         {
             // Setup