Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructureCreateExtensions.cs
===================================================================
diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -r489cbf6d1e84948fe927655e1a9bd4fcb4968bfe
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructureCreateExtensions.cs	(.../ClosingStructureCreateExtensions.cs)	(revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructureCreateExtensions.cs	(.../ClosingStructureCreateExtensions.cs)	(revision 489cbf6d1e84948fe927655e1a9bd4fcb4968bfe)
@@ -57,25 +57,25 @@
                 Id = structure.Id.DeepClone(),
                 X = structure.Location.X.ToNaNAsNull(),
                 Y = structure.Location.Y.ToNaNAsNull(),
-                StructureNormalOrientation = structure.StructureNormalOrientation.Value.ToNaNAsNull(),
-                StorageStructureAreaMean = structure.StorageStructureArea.Mean.Value.ToNaNAsNull(),
-                StorageStructureAreaCoefficientOfVariation = structure.StorageStructureArea.CoefficientOfVariation.Value.ToNaNAsNull(),
-                AllowedLevelIncreaseStorageMean = structure.AllowedLevelIncreaseStorage.Mean.Value.ToNaNAsNull(),
-                AllowedLevelIncreaseStorageStandardDeviation = structure.AllowedLevelIncreaseStorage.StandardDeviation.Value.ToNaNAsNull(),
-                WidthFlowAperturesMean = structure.WidthFlowApertures.Mean.Value.ToNaNAsNull(),
-                WidthFlowAperturesCoefficientOfVariation = structure.WidthFlowApertures.CoefficientOfVariation.Value.ToNaNAsNull(),
-                LevelCrestStructureNotClosingMean = structure.LevelCrestStructureNotClosing.Mean.Value.ToNaNAsNull(),
-                LevelCrestStructureNotClosingStandardDeviation = structure.LevelCrestStructureNotClosing.StandardDeviation.Value.ToNaNAsNull(),
-                InsideWaterLevelMean = structure.InsideWaterLevel.Mean.Value.ToNaNAsNull(),
-                InsideWaterLevelStandardDeviation = structure.InsideWaterLevel.StandardDeviation.Value.ToNaNAsNull(),
-                ThresholdHeightOpenWeirMean = structure.ThresholdHeightOpenWeir.Mean.Value.ToNaNAsNull(),
-                ThresholdHeightOpenWeirStandardDeviation = structure.ThresholdHeightOpenWeir.StandardDeviation.Value.ToNaNAsNull(),
-                AreaFlowAperturesMean = structure.AreaFlowApertures.Mean.Value.ToNaNAsNull(),
-                AreaFlowAperturesStandardDeviation = structure.AreaFlowApertures.StandardDeviation.Value.ToNaNAsNull(),
-                CriticalOvertoppingDischargeMean = structure.CriticalOvertoppingDischarge.Mean.Value.ToNaNAsNull(),
-                CriticalOvertoppingDischargeCoefficientOfVariation = structure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value.ToNaNAsNull(),
-                FlowWidthAtBottomProtectionMean = structure.FlowWidthAtBottomProtection.Mean.Value.ToNaNAsNull(),
-                FlowWidthAtBottomProtectionStandardDeviation = structure.FlowWidthAtBottomProtection.StandardDeviation.Value.ToNaNAsNull(),
+                StructureNormalOrientation = structure.StructureNormalOrientation.ToNaNAsNull(),
+                StorageStructureAreaMean = structure.StorageStructureArea.Mean.ToNaNAsNull(),
+                StorageStructureAreaCoefficientOfVariation = structure.StorageStructureArea.CoefficientOfVariation.ToNaNAsNull(),
+                AllowedLevelIncreaseStorageMean = structure.AllowedLevelIncreaseStorage.Mean.ToNaNAsNull(),
+                AllowedLevelIncreaseStorageStandardDeviation = structure.AllowedLevelIncreaseStorage.StandardDeviation.ToNaNAsNull(),
+                WidthFlowAperturesMean = structure.WidthFlowApertures.Mean.ToNaNAsNull(),
+                WidthFlowAperturesCoefficientOfVariation = structure.WidthFlowApertures.CoefficientOfVariation.ToNaNAsNull(),
+                LevelCrestStructureNotClosingMean = structure.LevelCrestStructureNotClosing.Mean.ToNaNAsNull(),
+                LevelCrestStructureNotClosingStandardDeviation = structure.LevelCrestStructureNotClosing.StandardDeviation.ToNaNAsNull(),
+                InsideWaterLevelMean = structure.InsideWaterLevel.Mean.ToNaNAsNull(),
+                InsideWaterLevelStandardDeviation = structure.InsideWaterLevel.StandardDeviation.ToNaNAsNull(),
+                ThresholdHeightOpenWeirMean = structure.ThresholdHeightOpenWeir.Mean.ToNaNAsNull(),
+                ThresholdHeightOpenWeirStandardDeviation = structure.ThresholdHeightOpenWeir.StandardDeviation.ToNaNAsNull(),
+                AreaFlowAperturesMean = structure.AreaFlowApertures.Mean.ToNaNAsNull(),
+                AreaFlowAperturesStandardDeviation = structure.AreaFlowApertures.StandardDeviation.ToNaNAsNull(),
+                CriticalOvertoppingDischargeMean = structure.CriticalOvertoppingDischarge.Mean.ToNaNAsNull(),
+                CriticalOvertoppingDischargeCoefficientOfVariation = structure.CriticalOvertoppingDischarge.CoefficientOfVariation.ToNaNAsNull(),
+                FlowWidthAtBottomProtectionMean = structure.FlowWidthAtBottomProtection.Mean.ToNaNAsNull(),
+                FlowWidthAtBottomProtectionStandardDeviation = structure.FlowWidthAtBottomProtection.StandardDeviation.ToNaNAsNull(),
                 ProbabilityOrFrequencyOpenStructureBeforeFlooding = structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding.ToNaNAsNull(),
                 FailureProbabilityOpenStructure = structure.FailureProbabilityOpenStructure.ToNaNAsNull(),
                 IdenticalApertures = structure.IdenticalApertures,