Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicBoundaryDataCreateExtensions.cs
===================================================================
diff -u -rb1191ae221e4e62aa151973e64e7507b4a6ad505 -rff8861b7a69ec8922c364e66af2717d066b844eb
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicBoundaryDataCreateExtensions.cs	(.../HydraulicBoundaryDataCreateExtensions.cs)	(revision b1191ae221e4e62aa151973e64e7507b4a6ad505)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicBoundaryDataCreateExtensions.cs	(.../HydraulicBoundaryDataCreateExtensions.cs)	(revision ff8861b7a69ec8922c364e66af2717d066b844eb)
@@ -60,7 +60,7 @@
             {
                 HydraulicLocationConfigurationDatabaseFilePath = hydraulicLocationConfigurationDatabase.FilePath.DeepClone(),
                 HydraulicLocationConfigurationDatabaseScenarioName = hydraulicLocationConfigurationDatabase.ScenarioName.DeepClone(),
-                HydraulicLocationConfigurationDatabaseYear = (int) hydraulicLocationConfigurationDatabase.Year,
+                HydraulicLocationConfigurationDatabaseYear = hydraulicLocationConfigurationDatabase.Year,
                 HydraulicLocationConfigurationDatabaseScope = hydraulicLocationConfigurationDatabase.Scope.DeepClone(),
                 HydraulicLocationConfigurationDatabaseSeaLevel = hydraulicLocationConfigurationDatabase.SeaLevel.DeepClone(),
                 HydraulicLocationConfigurationDatabaseRiverDischarge = hydraulicLocationConfigurationDatabase.RiverDischarge.DeepClone(),
Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/HydraulicBoundaryDataEntity.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -rff8861b7a69ec8922c364e66af2717d066b844eb
--- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/HydraulicBoundaryDataEntity.cs	(.../HydraulicBoundaryDataEntity.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/HydraulicBoundaryDataEntity.cs	(.../HydraulicBoundaryDataEntity.cs)	(revision ff8861b7a69ec8922c364e66af2717d066b844eb)
@@ -45,7 +45,7 @@
         public long AssessmentSectionEntityId { get; set; }
         public string HydraulicLocationConfigurationDatabaseFilePath { get; set; }
         public string HydraulicLocationConfigurationDatabaseScenarioName { get; set; }
-        public int HydraulicLocationConfigurationDatabaseYear { get; set; }
+        public int? HydraulicLocationConfigurationDatabaseYear { get; set; }
         public string HydraulicLocationConfigurationDatabaseScope { get; set; }
         public string HydraulicLocationConfigurationDatabaseSeaLevel { get; set; }
         public string HydraulicLocationConfigurationDatabaseRiverDischarge { get; set; }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicBoundaryDataCreateExtensionsTest.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -rff8861b7a69ec8922c364e66af2717d066b844eb
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicBoundaryDataCreateExtensionsTest.cs	(.../HydraulicBoundaryDataCreateExtensionsTest.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/HydraulicBoundaryDataCreateExtensionsTest.cs	(.../HydraulicBoundaryDataCreateExtensionsTest.cs)	(revision ff8861b7a69ec8922c364e66af2717d066b844eb)
@@ -57,31 +57,36 @@
         }
 
         [Test]
-        public void Create_ValidHydraulicBoundaryData_ReturnsHydraulicBoundaryDataEntity()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Create_ValidHydraulicBoundaryData_ReturnsHydraulicBoundaryDataEntity(bool withScenarioConfiguration)
         {
             // Setup
-            var random = new Random(21);
             var hydraulicBoundaryData = new HydraulicBoundaryData
             {
                 HydraulicLocationConfigurationDatabase =
                 {
-                    FilePath = "hlcdFilePath",
-                    ScenarioName = "ScenarioName",
-                    Year = random.Next(),
-                    Scope = "Scope",
-                    SeaLevel = "SeaLevel",
-                    RiverDischarge = "RiverDischarge",
-                    LakeLevel = "LakeLevel",
-                    WindDirection = "WindDirection",
-                    WindSpeed = "WindSpeed",
-                    Comment = "Comment"
+                    FilePath = "hlcdFilePath"
                 },
                 HydraulicBoundaryDatabases =
                 {
                     new HydraulicBoundaryDatabase()
                 }
             };
 
+            if (withScenarioConfiguration)
+            {
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.ScenarioName = "ScenarioName";
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.Year = new Random(21).Next();
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.Scope = "Scope";
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.SeaLevel = "SeaLevel";
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.RiverDischarge = "RiverDischarge";
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.LakeLevel = "LakeLevel";
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.WindDirection = "WindDirection";
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.WindSpeed = "WindSpeed";
+                hydraulicBoundaryData.HydraulicLocationConfigurationDatabase.Comment = "Comment";
+            }
+
             // Call
             HydraulicBoundaryDataEntity entity = hydraulicBoundaryData.Create(new PersistenceRegistry());