Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -36,6 +36,7 @@
         /// <param name="section">The section to create a database entity for.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="AssessmentSectionEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static AssessmentSectionEntity Create(this AssessmentSection section, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/FailureMechanismPlaceholderCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/FailureMechanismPlaceholderCreateExtensions.cs	(.../FailureMechanismPlaceholderCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/FailureMechanismPlaceholderCreateExtensions.cs	(.../FailureMechanismPlaceholderCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -37,6 +37,7 @@
         /// <param name="type">The type of the failure mechanism that is being created.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="FailureMechanismEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static FailureMechanismEntity Create(this FailureMechanismPlaceholder mechanism, FailureMechanismType type, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -36,6 +36,7 @@
         /// <param name="location">The location to create a database entity for.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="HydraulicLocationEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static HydraulicLocationEntity Create(this HydraulicBoundaryLocation location, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs	(.../PipingFailureMechanismCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs	(.../PipingFailureMechanismCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -36,6 +36,7 @@
         /// <param name="mechanism">The failure mechanism to create a database entity for.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="FailureMechanismEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static FailureMechanismEntity Create(this PipingFailureMechanism mechanism, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingSoilLayerCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingSoilLayerCreateExtensions.cs	(.../PipingSoilLayerCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingSoilLayerCreateExtensions.cs	(.../PipingSoilLayerCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -36,6 +36,7 @@
         /// <param name="layer">The layer to create a database entity for.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="SoilLayerEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static SoilLayerEntity Create(this PipingSoilLayer layer, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingSoilProfileCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingSoilProfileCreateExtensions.cs	(.../PipingSoilProfileCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingSoilProfileCreateExtensions.cs	(.../PipingSoilProfileCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -37,6 +37,7 @@
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="SoilProfileEntity"/> or one from the <paramref name="collector"/> if it
         /// was created for the <see cref="profile"/> earlier.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static SoilProfileEntity Create(this PipingSoilProfile profile, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProjectCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProjectCreateExtensions.cs	(.../ProjectCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProjectCreateExtensions.cs	(.../ProjectCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -38,6 +38,7 @@
         /// <param name="project">The project to create a database entity for.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="ProjectEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static ProjectEntity Create(this Project project, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StochasticSoilModelCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StochasticSoilModelCreateExtensions.cs	(.../StochasticSoilModelCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StochasticSoilModelCreateExtensions.cs	(.../StochasticSoilModelCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -36,6 +36,7 @@
         /// <param name="model">The model to create a database entity for.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="StochasticSoilModelEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static StochasticSoilModelEntity Create(this StochasticSoilModel model, CreateConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StochasticSoilProfileCreateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StochasticSoilProfileCreateExtensions.cs	(.../StochasticSoilProfileCreateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StochasticSoilProfileCreateExtensions.cs	(.../StochasticSoilProfileCreateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -36,6 +36,7 @@
         /// <param name="profile">The profile to create a database entity for.</param>
         /// <param name="collector">The object keeping track of create operations.</param>
         /// <returns>A new <see cref="StochasticSoilProfileEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public static StochasticSoilProfileEntity Create(this StochasticSoilProfile profile, CreateConversionCollector collector)
         {
             var entity = new StochasticSoilProfileEntity
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs	(.../AssessmentSectionEntity.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs	(.../AssessmentSectionEntity.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,7 @@
         /// </summary>
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="AssessmentSection"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public AssessmentSection Read(ReadConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntity.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntity.cs	(.../FailureMechanismEntity.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntity.cs	(.../FailureMechanismEntity.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -37,6 +37,7 @@
         /// </summary>
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="PipingFailureMechanism"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public PipingFailureMechanism ReadAsPipingFailureMechanism(ReadConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ProjectEntity.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ProjectEntity.cs	(.../ProjectEntity.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ProjectEntity.cs	(.../ProjectEntity.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Application.Ringtoets.Storage.Read;
 using Core.Common.Base.Data;
 
@@ -35,8 +36,13 @@
         /// </summary>
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="Project"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public Project Read(ReadConversionCollector collector)
         {
+            if (collector == null)
+            {
+                throw new ArgumentNullException("collector");
+            }
             var project = new Project
             {
                 StorageId = ProjectEntityId,
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SoilProfileEntity.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SoilProfileEntity.cs	(.../SoilProfileEntity.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SoilProfileEntity.cs	(.../SoilProfileEntity.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -38,6 +38,7 @@
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="PipingSoilProfile"/> or one from the <paramref name="collector"/> if the 
         /// <see cref="SoilProfileEntity"/> has been read before.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public PipingSoilProfile Read(ReadConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StochasticSoilModelEntity.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StochasticSoilModelEntity.cs	(.../StochasticSoilModelEntity.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StochasticSoilModelEntity.cs	(.../StochasticSoilModelEntity.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -36,6 +36,7 @@
         /// </summary>
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="StochasticSoilModel"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public StochasticSoilModel Read(ReadConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StochasticSoilProfileEntity.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StochasticSoilProfileEntity.cs	(.../StochasticSoilProfileEntity.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StochasticSoilProfileEntity.cs	(.../StochasticSoilProfileEntity.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -37,6 +37,7 @@
         /// </summary>
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="StochasticSoilProfile"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
         public StochasticSoilProfile Read(ReadConversionCollector collector)
         {
             if (collector == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs	(.../AssessmentSectionUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs	(.../AssessmentSectionUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -42,6 +42,11 @@
         /// <param name="section">The section to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this AssessmentSection section, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/FailureMechanismPlaceholderUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/FailureMechanismPlaceholderUpdateExtensions.cs	(.../FailureMechanismPlaceholderUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/FailureMechanismPlaceholderUpdateExtensions.cs	(.../FailureMechanismPlaceholderUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,11 @@
         /// <param name="mechanism">The mechanism to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this FailureMechanismPlaceholder mechanism, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HydraulicBoundaryLocationUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HydraulicBoundaryLocationUpdateExtensions.cs	(.../HydraulicBoundaryLocationUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HydraulicBoundaryLocationUpdateExtensions.cs	(.../HydraulicBoundaryLocationUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,11 @@
         /// <param name="location">The location to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this HydraulicBoundaryLocation location, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingFailureMechanismUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingFailureMechanismUpdateExtensions.cs	(.../PipingFailureMechanismUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingFailureMechanismUpdateExtensions.cs	(.../PipingFailureMechanismUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,11 @@
         /// <param name="mechanism">The mechanism to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this PipingFailureMechanism mechanism, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingSoilLayerUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingSoilLayerUpdateExtensions.cs	(.../PipingSoilLayerUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingSoilLayerUpdateExtensions.cs	(.../PipingSoilLayerUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,11 @@
         /// <param name="layer">The layer to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this PipingSoilLayer layer, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingSoilProfileUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingSoilProfileUpdateExtensions.cs	(.../PipingSoilProfileUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingSoilProfileUpdateExtensions.cs	(.../PipingSoilProfileUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,11 @@
         /// <param name="profile">The profile to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this PipingSoilProfile profile, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ProjectUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ProjectUpdateExtensions.cs	(.../ProjectUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ProjectUpdateExtensions.cs	(.../ProjectUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -41,6 +41,11 @@
         /// <param name="project">The project to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this Project project, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StochasticSoilModelUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StochasticSoilModelUpdateExtensions.cs	(.../StochasticSoilModelUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StochasticSoilModelUpdateExtensions.cs	(.../StochasticSoilModelUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,11 @@
         /// <param name="model">The model to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this StochasticSoilModel model, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StochasticSoilProfileUpdateExtensions.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StochasticSoilProfileUpdateExtensions.cs	(.../StochasticSoilProfileUpdateExtensions.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StochasticSoilProfileUpdateExtensions.cs	(.../StochasticSoilProfileUpdateExtensions.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -40,6 +40,11 @@
         /// <param name="profile">The profile to update the database entity for.</param>
         /// <param name="collector">The object keeping track of update operations.</param>
         /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="collector"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
         public static void Update(this StochasticSoilProfile profile, UpdateConversionCollector collector, IRingtoetsEntities context)
         {
             if (context == null)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityTest.cs
===================================================================
diff -u -r75a219c391144ca71a684f46e96e5d3f0c17f170 -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityTest.cs	(.../ProjectEntityTest.cs)	(revision 75a219c391144ca71a684f46e96e5d3f0c17f170)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityTest.cs	(.../ProjectEntityTest.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -30,9 +30,23 @@
     public class ProjectEntityTest
     {
         [Test]
-        public void Read_Always_ReturnsNewProjectWithPropertiesSet()
+        public void Read_WithoutCollector_ThrowsArgumentNullException()
         {
             // Setup
+            var entity = new ProjectEntity();
+
+            // Call
+            TestDelegate test = () => entity.Read(null);
+
+            // Assert
+            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("collector", parameter);
+        }
+
+        [Test]
+        public void Read_WithCollector_ReturnsNewProjectWithPropertiesSet()
+        {
+            // Setup
             var testDescription = "testName";
             var entityId = new Random(21).Next(1,502);
             var entity = new ProjectEntity
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CommentViewTest.cs
===================================================================
diff -u -rdf9dd8dde87c5cae3f3d72a9c5e7dd440fa7f9ef -r56fcaa1987b9a7235553ff43a0a4f36b46efdb2e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CommentViewTest.cs	(.../CommentViewTest.cs)	(revision df9dd8dde87c5cae3f3d72a9c5e7dd440fa7f9ef)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/CommentViewTest.cs	(.../CommentViewTest.cs)	(revision 56fcaa1987b9a7235553ff43a0a4f36b46efdb2e)
@@ -113,7 +113,6 @@
         }
 
         [Test]
-        [Timeout(250)] // Temporary guard, as this test has timed out > 50minutes in the past.
         public void RichTextEditorOnTextChanged_Always_SetsComments()
         {
             // Setup
@@ -140,7 +139,6 @@
 
                 // Call
                 richTextBoxControl.Rtf = validRtfString;
-                EventHelper.RaiseEvent(richTextBoxControl, "TextBoxValueChanged", EventArgs.Empty);
 
                 // Assert
                 Assert.AreEqual(validRtfString, data.Comments);