Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u -r1ea93714d7063df84c6ecf043209ef821ca54a70 -ra30b67748bed77736f62b6b3c30c82649bb9cf4e
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision 1ea93714d7063df84c6ecf043209ef821ca54a70)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision a30b67748bed77736f62b6b3c30c82649bb9cf4e)
@@ -63,18 +63,20 @@
         }
 
         [Test]
-        public void Constructor_IdNull_ThrowsArgumentNullException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_IdInvalid_ThrowsArgumentException(string id)
         {
             // Call
-            TestDelegate call = () => new SerializableFailureMechanismSectionAssembly(null,
+            TestDelegate call = () => new SerializableFailureMechanismSectionAssembly(id,
                                                                                       new SerializableFailureMechanism(),
                                                                                       new SerializableFailureMechanismSection(),
                                                                                       new SerializableFailureMechanismSectionAssemblyResult[0],
                                                                                       new SerializableFailureMechanismSectionAssemblyResult());
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("id", exception.ParamName);
+            const string expectedMessage = "'id' must have a value.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
         }
 
         [Test]