Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs
===================================================================
diff -u -r1a21fe49fb4da6afcf09e90eb99c40cdcabf46df -ra30b67748bed77736f62b6b3c30c82649bb9cf4e
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs	(.../SerializableTotalAssemblyResultTest.cs)	(revision 1a21fe49fb4da6afcf09e90eb99c40cdcabf46df)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs	(.../SerializableTotalAssemblyResultTest.cs)	(revision a30b67748bed77736f62b6b3c30c82649bb9cf4e)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.IO.Model;
 using Ringtoets.AssemblyTool.IO.Model.DataTypes;
@@ -60,18 +61,20 @@
         }
 
         [Test]
-        public void Constructor_IdNull_ThrowsArgumentNullException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_IdInvalid_ThrowsArgumentException(string id)
         {
             // Call
-            TestDelegate call = () => new SerializableTotalAssemblyResult(null,
+            TestDelegate call = () => new SerializableTotalAssemblyResult(id,
                                                                           new SerializableAssessmentProcess(),
                                                                           new SerializableFailureMechanismAssemblyResult(),
                                                                           new SerializableFailureMechanismAssemblyResult(),
                                                                           new SerializableAssessmentSectionAssemblyResult());
 
             // 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]