Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r2630 -r2645
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 2630)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 2645)
@@ -609,13 +609,13 @@
         public void RaiseExceptionWhenRiverLevelIsMissing()
         {
             // Given DataSet with undefined RiverLevel
-            DamProjectData expectedDamProjectData = CreateExampleDamProjectData();
-            var scenario = expectedDamProjectData.WaterBoard.Dikes[0].Locations[0].Scenarios[0];
+            DamProjectData damProjectData = CreateExampleDamProjectData();
+            var scenario = damProjectData.WaterBoard.Dikes[0].Locations[0].Scenarios[0];
             scenario.RiverLevel = null;
 
             // When Writing Xml, Then Raise Exception With Clear Message
-            var expectedMessage = "Location 'Location 1', scenario '1' has no river level" + Environment.NewLine + "Parameter name: value";
-            Assert.That(() => FillXmlInputFromDamUi.CreateInput(expectedDamProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
+            var expectedMessage = "Location 'Location 1', scenario '1' has no river level" + Environment.NewLine + "Parameter name: RiverLevel";
+            Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
         }
 
         [Test]
@@ -627,23 +627,35 @@
         public void RaiseExceptionWhenRiverLevelLowIsMissingForStabilityOutside(FailureMechanismSystemType failureMechanismSystemType, string expectedMessage)
         {
             // Given DataSet with undefined RiverLevelLow
-            DamProjectData expectedDamProjectData = CreateExampleDamProjectData();
-            var scenario = expectedDamProjectData.WaterBoard.Dikes[0].Locations[0].Scenarios[0];
+            DamProjectData damProjectData = CreateExampleDamProjectData();
+            var scenario = damProjectData.WaterBoard.Dikes[0].Locations[0].Scenarios[0];
             scenario.RiverLevelLow = null;
-            var currentSpecification = expectedDamProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+            var currentSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
             currentSpecification.FailureMechanismSystemType = failureMechanismSystemType;
 
             // When Writing Xml, Then Raise Exception With Clear Message in case of Stability Outside
             if (expectedMessage != string.Empty)
             {
-                Assert.That(() => FillXmlInputFromDamUi.CreateInput(expectedDamProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.Contains(expectedMessage));
+                Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.Contains(expectedMessage));
             }
             else
             {
-                Assert.That(() => FillXmlInputFromDamUi.CreateInput(expectedDamProjectData), Throws.Nothing);
+                Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), Throws.Nothing);
             }
         }
 
+        [Test]
+        public void RaiseExceptionWhenWaterBoardIsNotDefined()
+        {
+            // Given DataSet with undefine waterboard
+            DamProjectData damProjectData = new DamProjectData();
+            damProjectData.WaterBoard = null;
+
+            // When Writing Xml, Then Raise Exception With Clear Message in case of Stability Outside
+            var expectedMessage = "No dike defined in this project" + Environment.NewLine + "Parameter name: WaterBoard";
+            Assert.That(() => FillXmlInputFromDamUi.CreateInput(damProjectData), Throws.TypeOf(typeof(ArgumentNullException)).With.Message.EqualTo(expectedMessage));
+        }
+
     }
 }