Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructureCreateExtensions.cs
===================================================================
diff -u -r583a729a502f52ca415627efcb2287886e8efb1d -r489cbf6d1e84948fe927655e1a9bd4fcb4968bfe
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructureCreateExtensions.cs	(.../HeightStructureCreateExtensions.cs)	(revision 583a729a502f52ca415627efcb2287886e8efb1d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructureCreateExtensions.cs	(.../HeightStructureCreateExtensions.cs)	(revision 489cbf6d1e84948fe927655e1a9bd4fcb4968bfe)
@@ -57,20 +57,20 @@
                 Id = structure.Id.DeepClone(),
                 X = structure.Location.X.ToNaNAsNull(),
                 Y = structure.Location.Y.ToNaNAsNull(),
-                StructureNormalOrientation = structure.StructureNormalOrientation.Value.ToNaNAsNull(),
-                AllowedLevelIncreaseStorageMean = structure.AllowedLevelIncreaseStorage.Mean.Value.ToNaNAsNull(),
-                AllowedLevelIncreaseStorageStandardDeviation = structure.AllowedLevelIncreaseStorage.StandardDeviation.Value.ToNaNAsNull(),
-                CriticalOvertoppingDischargeMean = structure.CriticalOvertoppingDischarge.Mean.Value.ToNaNAsNull(),
-                CriticalOvertoppingDischargeCoefficientOfVariation = structure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value.ToNaNAsNull(),
+                StructureNormalOrientation = structure.StructureNormalOrientation.ToNaNAsNull(),
+                AllowedLevelIncreaseStorageMean = structure.AllowedLevelIncreaseStorage.Mean.ToNaNAsNull(),
+                AllowedLevelIncreaseStorageStandardDeviation = structure.AllowedLevelIncreaseStorage.StandardDeviation.ToNaNAsNull(),
+                CriticalOvertoppingDischargeMean = structure.CriticalOvertoppingDischarge.Mean.ToNaNAsNull(),
+                CriticalOvertoppingDischargeCoefficientOfVariation = structure.CriticalOvertoppingDischarge.CoefficientOfVariation.ToNaNAsNull(),
                 FailureProbabilityStructureWithErosion = structure.FailureProbabilityStructureWithErosion.ToNaNAsNull(),
-                FlowWidthAtBottomProtectionMean = structure.FlowWidthAtBottomProtection.Mean.Value.ToNaNAsNull(),
-                FlowWidthAtBottomProtectionStandardDeviation = structure.FlowWidthAtBottomProtection.StandardDeviation.Value.ToNaNAsNull(),
-                LevelCrestStructureMean = structure.LevelCrestStructure.Mean.Value.ToNaNAsNull(),
-                LevelCrestStructureStandardDeviation = structure.LevelCrestStructure.StandardDeviation.Value.ToNaNAsNull(),
-                StorageStructureAreaMean = structure.StorageStructureArea.Mean.Value.ToNaNAsNull(),
-                StorageStructureAreaCoefficientOfVariation = structure.StorageStructureArea.CoefficientOfVariation.Value.ToNaNAsNull(),
-                WidthFlowAperturesMean = structure.WidthFlowApertures.Mean.Value.ToNaNAsNull(),
-                WidthFlowAperturesCoefficientOfVariation = structure.WidthFlowApertures.CoefficientOfVariation.Value.ToNaNAsNull(),
+                FlowWidthAtBottomProtectionMean = structure.FlowWidthAtBottomProtection.Mean.ToNaNAsNull(),
+                FlowWidthAtBottomProtectionStandardDeviation = structure.FlowWidthAtBottomProtection.StandardDeviation.ToNaNAsNull(),
+                LevelCrestStructureMean = structure.LevelCrestStructure.Mean.ToNaNAsNull(),
+                LevelCrestStructureStandardDeviation = structure.LevelCrestStructure.StandardDeviation.ToNaNAsNull(),
+                StorageStructureAreaMean = structure.StorageStructureArea.Mean.ToNaNAsNull(),
+                StorageStructureAreaCoefficientOfVariation = structure.StorageStructureArea.CoefficientOfVariation.ToNaNAsNull(),
+                WidthFlowAperturesMean = structure.WidthFlowApertures.Mean.ToNaNAsNull(),
+                WidthFlowAperturesCoefficientOfVariation = structure.WidthFlowApertures.CoefficientOfVariation.ToNaNAsNull(),
                 Order = order
             };