Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicLocationConfigurationDatabase.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -rb1191ae221e4e62aa151973e64e7507b4a6ad505
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicLocationConfigurationDatabase.cs	(.../HydraulicLocationConfigurationDatabase.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicLocationConfigurationDatabase.cs	(.../HydraulicLocationConfigurationDatabase.cs)	(revision b1191ae221e4e62aa151973e64e7507b4a6ad505)
@@ -41,7 +41,7 @@
         /// <summary>
         /// Gets or sets the year.
         /// </summary>
-        public int Year { get; set; }
+        public int? Year { get; set; }
 
         /// <summary>
         /// Gets or sets the scope.
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationDatabaseTest.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -rb1191ae221e4e62aa151973e64e7507b4a6ad505
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationDatabaseTest.cs	(.../HydraulicLocationConfigurationDatabaseTest.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationDatabaseTest.cs	(.../HydraulicLocationConfigurationDatabaseTest.cs)	(revision b1191ae221e4e62aa151973e64e7507b4a6ad505)
@@ -38,7 +38,7 @@
             Assert.IsInstanceOf<Observable>(hydraulicLocationConfigurationDatabase);
             Assert.IsNull(hydraulicLocationConfigurationDatabase.FilePath);
             Assert.IsNull(hydraulicLocationConfigurationDatabase.ScenarioName);
-            Assert.AreEqual(0, hydraulicLocationConfigurationDatabase.Year);
+            Assert.IsNull(hydraulicLocationConfigurationDatabase.Year);
             Assert.IsNull(hydraulicLocationConfigurationDatabase.Scope);
             Assert.IsNull(hydraulicLocationConfigurationDatabase.SeaLevel);
             Assert.IsNull(hydraulicLocationConfigurationDatabase.RiverDischarge);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicBoundaryDataCreateExtensions.cs
===================================================================
diff -u -rd9119b8f4a74fb2a6f3ececeaea94f0e58513c52 -rb1191ae221e4e62aa151973e64e7507b4a6ad505
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicBoundaryDataCreateExtensions.cs	(.../HydraulicBoundaryDataCreateExtensions.cs)	(revision d9119b8f4a74fb2a6f3ececeaea94f0e58513c52)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/HydraulicBoundaryDataCreateExtensions.cs	(.../HydraulicBoundaryDataCreateExtensions.cs)	(revision b1191ae221e4e62aa151973e64e7507b4a6ad505)
@@ -60,7 +60,7 @@
             {
                 HydraulicLocationConfigurationDatabaseFilePath = hydraulicLocationConfigurationDatabase.FilePath.DeepClone(),
                 HydraulicLocationConfigurationDatabaseScenarioName = hydraulicLocationConfigurationDatabase.ScenarioName.DeepClone(),
-                HydraulicLocationConfigurationDatabaseYear = hydraulicLocationConfigurationDatabase.Year,
+                HydraulicLocationConfigurationDatabaseYear = (int) hydraulicLocationConfigurationDatabase.Year,
                 HydraulicLocationConfigurationDatabaseScope = hydraulicLocationConfigurationDatabase.Scope.DeepClone(),
                 HydraulicLocationConfigurationDatabaseSeaLevel = hydraulicLocationConfigurationDatabase.SeaLevel.DeepClone(),
                 HydraulicLocationConfigurationDatabaseRiverDischarge = hydraulicLocationConfigurationDatabase.RiverDischarge.DeepClone(),