Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/XMLPipingConfigurationSchema.xsd
===================================================================
diff -u -ra1c473b1a3abab7f1c53ad5cea01a152741c65b8 -ree94c927bb860c7db9e4035f82aef305809e56fb
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/XMLPipingConfigurationSchema.xsd	(.../XMLPipingConfigurationSchema.xsd)	(revision a1c473b1a3abab7f1c53ad5cea01a152741c65b8)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/XMLPipingConfigurationSchema.xsd	(.../XMLPipingConfigurationSchema.xsd)	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -103,10 +103,10 @@
 	</xs:element>
 	<xs:element name="stochast">
 		<xs:complexType>
-			<xs:choice minOccurs="2" maxOccurs="2">
-				<xs:element ref="verwachtingswaarde" minOccurs="1" maxOccurs="1"/>
-				<xs:element ref="standaardafwijking" minOccurs="1" maxOccurs="1"/>
-			</xs:choice>
+			<xs:all>
+				<xs:element ref="verwachtingswaarde"/>
+				<xs:element ref="standaardafwijking"/>
+			</xs:all>
 			<xs:attribute name="naam" use="required">
 				<xs:simpleType>
 					<xs:restriction base="xs:string">
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs
===================================================================
diff -u -r6e955278e4e469aa7d85d98ca3fed22219abc477 -ree94c927bb860c7db9e4035f82aef305809e56fb
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs	(.../PipingConfigurationReaderTest.cs)	(revision 6e955278e4e469aa7d85d98ca3fed22219abc477)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs	(.../PipingConfigurationReaderTest.cs)	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -140,6 +140,27 @@
         [Test]
         [TestCase("invalidFolderWithoutName.xml")]
         [TestCase("invalidCalculationWithoutName.xml")]
+        [TestCase("invalidAssessmentLevelEmpty.xml")]
+        [TestCase("invalidAssessmentLevelNoDouble.xml")]
+        [TestCase("invalidAssessmentLevelWrongCulture.xml")]
+        [TestCase("invalidEntryPointEmpty.xml")]
+        [TestCase("invalidEntryPointNoDouble.xml")]
+        [TestCase("invalidEntryPointWrongCulture.xml")]
+        [TestCase("invalidExitPointEmpty.xml")]
+        [TestCase("invalidExitPointNoDouble.xml")]
+        [TestCase("invalidExitPointWrongCulture.xml")]
+        [TestCase("invalidStochastWithoutName.xml")]
+        [TestCase("invalidStochastWithUnknownName.xml")]
+        [TestCase("invalidStochastWithoutMean.xml")]
+        [TestCase("invalidStochastWithoutStandardDeviation.xml")]
+        [TestCase("invalidStochastWithMultipleMean.xml")]
+        [TestCase("invalidStochastWithMultipleStandardDeviation.xml")]
+        [TestCase("invalidStochastMeanEmpty.xml")]
+        [TestCase("invalidStochastMeanNoDouble.xml")]
+        [TestCase("invalidStochastMeanWrongCulture.xml")]
+        [TestCase("invalidStochastStandardDeviationEmpty.xml")]
+        [TestCase("invalidStochastStandardDeviationNoDouble.xml")]
+        [TestCase("invalidStochastStandardDeviationWrongCulture.xml")]
         public void Constructor_FileInvalidBasedOnSchemaDefinition_ThrowCriticalFileReadException(string fileName)
         {
             // Setup
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelEmpty.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelEmpty.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelEmpty.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <toetspeil/>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelNoDouble.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelNoDouble.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelNoDouble.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <toetspeil>string</toetspeil>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelWrongCulture.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelWrongCulture.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidAssessmentLevelWrongCulture.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <toetspeil>1,2</toetspeil>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointEmpty.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointEmpty.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointEmpty.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <intredepunt/>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointNoDouble.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointNoDouble.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointNoDouble.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <intredepunt>string</intredepunt>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointWrongCulture.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointWrongCulture.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidEntryPointWrongCulture.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <intredepunt>1,2</intredepunt>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointEmpty.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointEmpty.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointEmpty.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <uittredepunt/>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointNoDouble.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointNoDouble.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointNoDouble.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <uittredepunt>string</uittredepunt>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointWrongCulture.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointWrongCulture.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidExitPointWrongCulture.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <uittredepunt>1,2</uittredepunt>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanEmpty.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanEmpty.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanEmpty.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde></verwachtingswaarde>
+      <standaardafwijking>0.100</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanNoDouble.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanNoDouble.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanNoDouble.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>string</verwachtingswaarde>
+      <standaardafwijking>0.100</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanWrongCulture.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanWrongCulture.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastMeanWrongCulture.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>1,2</verwachtingswaarde>
+      <standaardafwijking>0.100</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationEmpty.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationEmpty.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationEmpty.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+      <standaardafwijking></standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationNoDouble.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationNoDouble.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationNoDouble.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+      <standaardafwijking>string</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationWrongCulture.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationWrongCulture.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastStandardDeviationWrongCulture.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+      <standaardafwijking>1,2</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithMultipleMean.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithMultipleMean.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithMultipleMean.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+      <verwachtingswaarde>1.000</verwachtingswaarde>
+      <standaardafwijking>0.100</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithMultipleStandardDeviation.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithMultipleStandardDeviation.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithMultipleStandardDeviation.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+      <standaardafwijking>0.100</standaardafwijking>
+      <standaardafwijking>0.200</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithUnknownName.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithUnknownName.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithUnknownName.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="Test">
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+      <standaardafwijking>0.100</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutMean.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutMean.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutMean.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <standaardafwijking>0.100</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutName.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutName.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutName.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast>
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+      <standaardafwijking>0.100</standaardafwijking>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutStandardDeviation.xml
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutStandardDeviation.xml	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/invalidStochastWithoutStandardDeviation.xml	(revision ee94c927bb860c7db9e4035f82aef305809e56fb)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <berekening naam="Calculation">
+    <stochast naam="polderpeil">
+      <verwachtingswaarde>0.000</verwachtingswaarde>
+    </stochast>
+  </berekening>
+</root>
\ No newline at end of file