Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionContextPropertiesTest.cs
===================================================================
diff -u -r04a75d409f31056c8a55a8a97dc3f511c25ff212 -r0bf7bef98d08bd001d4c999443ce5f4e8761c674
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionContextPropertiesTest.cs	(.../FailureMechanismContributionContextPropertiesTest.cs)	(revision 04a75d409f31056c8a55a8a97dc3f511c25ff212)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionContextPropertiesTest.cs	(.../FailureMechanismContributionContextPropertiesTest.cs)	(revision 0bf7bef98d08bd001d4c999443ce5f4e8761c674)
@@ -106,16 +106,19 @@
             var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
             var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 1.0/returnPeriod);
 
-            // Call
             var properties = new FailureMechanismContributionContextProperties()
             {
                 Data = contribution,
                 AssessmentSection = assessmentSection
             };
 
+            // Call
+            int returnPeriodPropertyValue = properties.ReturnPeriod;
+            AssessmentSectionComposition compositionPropertyValue = properties.AssessmentSectionComposition;
+
             // Assert
-            Assert.AreEqual(returnPeriod, properties.ReturnPeriod);
-            Assert.AreEqual(assessmentSectionComposition, properties.AssessmentSectionComposition);
+            Assert.AreEqual(returnPeriod, returnPeriodPropertyValue);
+            Assert.AreEqual(assessmentSectionComposition, compositionPropertyValue);
             mocks.VerifyAll();
         }
 
@@ -306,6 +309,36 @@
         }
 
         [Test]
+        [TestCase(int.MinValue)]
+        [TestCase(int.MaxValue)]
+        [TestCase(99)]
+        [TestCase(1000001)]
+        public void ReturnPeriod_InvalidValue_ThrowsArgumentOutOfRangeException(int invalidReturnPeriod)
+        {
+            // Setup
+            var assessmentSectionComposition = AssessmentSectionComposition.DikeAndDune;
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.Stub(section => section.Composition).Return(assessmentSectionComposition);
+            mocks.ReplayAll();
+
+            var failureMechanisms = Enumerable.Empty<IFailureMechanism>();
+            var contribution = new FailureMechanismContribution(failureMechanisms, 1.1, 1.0/200);
+
+            var properties = new FailureMechanismContributionContextProperties()
+            {
+                Data = contribution,
+                AssessmentSection = assessmentSection
+            };
+
+            // Call
+            TestDelegate call = () => properties.ReturnPeriod = invalidReturnPeriod;
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call,
+                                                                                                "De waarde voor de 'Norm' moet in het bereik [100, 1000000] liggen.");
+        }
+
+        [Test]
         [TestCase(AssessmentSectionComposition.Dike, AssessmentSectionComposition.Dune)]
         [TestCase(AssessmentSectionComposition.Dike, AssessmentSectionComposition.DikeAndDune)]
         [TestCase(AssessmentSectionComposition.Dune, AssessmentSectionComposition.Dike)]
@@ -327,10 +360,10 @@
                                     .Return(true);
             compositionChangeHandler.Expect(h => h.ChangeComposition(assessmentSection, newComposition))
                                     .Return(new[]
-								{
-									observable1,
-									observable2
-								});
+                                    {
+                                        observable1,
+                                        observable2
+                                    });
             mocks.ReplayAll();
 
             var properties = new FailureMechanismContributionContextProperties()