Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -44,7 +44,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             ClosingStructuresFailureMechanismSectionResult failureMechanismSectionResult)
@@ -63,7 +63,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -76,7 +76,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this calculation.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleDetailedAssembly(
             ClosingStructuresFailureMechanismSectionResult failureMechanismSectionResult,
@@ -114,7 +114,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../ClosingStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -101,7 +101,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -117,7 +117,7 @@
                 TestDelegate call = () => ClosingStructuresFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
@@ -259,7 +259,7 @@
         }
 
         [Test]
-        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             var random = new Random(21);
@@ -290,7 +290,7 @@
                     assessmentSection);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs
===================================================================
diff -u -r77413ce11244a9aa8a12fd50aa8cee99bfe54476 -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision 77413ce11244a9aa8a12fd50aa8cee99bfe54476)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -39,7 +39,7 @@
         /// <param name="signalingNorm">The signaling norm to use in the calculation.</param>
         /// <param name="lowerLimitNorm">The lower limit norm to use in the calculation.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="AssessmentSectionAssemblyCategory"/>.</returns>
-        /// <exception cref="AssemblyFactoryException">Thrown when an error occurred while creating the categories.</exception>
+        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
         public static IEnumerable<AssessmentSectionAssemblyCategory> CreateAssessmentSectionAssemblyCategories(double signalingNorm, double lowerLimitNorm)
         {
             IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateAssemblyCategoriesCalculator(
@@ -51,7 +51,7 @@
             }
             catch (AssemblyCategoriesCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -64,7 +64,7 @@
         /// <param name="n">The n to calculate with.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> with categories of
         /// <see cref="FailureMechanismSectionAssemblyCategory"/>.</returns>
-        /// <exception cref="AssemblyFactoryException">Thrown when an error occurred while creating the categories.</exception>
+        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
         public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateFailureMechanismSectionAssemblyCategories(
             double signalingNorm,
             double lowerLimitNorm,
@@ -83,7 +83,7 @@
             }
             catch (AssemblyCategoriesCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -96,7 +96,7 @@
         /// <param name="n">The n to calculate with.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> with categories of
         /// <see cref="FailureMechanismSectionAssemblyCategory"/>.</returns>
-        /// <exception cref="AssemblyFactoryException">Thrown when an error occurred while creating the categories.</exception>
+        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
         public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateGeotechnicFailureMechanismSectionAssemblyCategories(
             double signalingNorm,
             double lowerLimitNorm,
@@ -115,7 +115,7 @@
             }
             catch (AssemblyCategoriesCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Exceptions/AssemblyException.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/Exceptions/AssemblyException.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Exceptions/AssemblyException.cs	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -0,0 +1,68 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Ringtoets.Common.Data.Exceptions
+{
+    /// <summary>
+    /// Exception that is thrown when performing an assembly has failed.
+    /// </summary>
+    [Serializable]
+    public class AssemblyException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssemblyException"/> class.
+        /// </summary>
+        public AssemblyException() {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssemblyException"/> class 
+        /// with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public AssemblyException(string message)
+            : base(message) {}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssemblyException"/> class with a specified error message 
+        /// and a reference to the inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception,
+        /// or <c>null</c> if no inner exception is specified.</param>
+        public AssemblyException(string message, Exception innerException) : base(message, innerException) {}
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="AssemblyException"/> with
+        /// serialized data.</summary>
+        /// <param name="info">The <see cref="SerializationInfo"/> that holds the serialized
+        /// object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="StreamingContext"/> that contains contextual
+        /// information about the source or destination.</param>
+        /// <exception cref="ArgumentNullException">The <paramref name="info"/> parameter is
+        /// <c>null</c>.</exception>
+        /// <exception cref="SerializationException">The class name is <c>null</c> or
+        /// <see cref="Exception.HResult" /> is zero (0).</exception>
+        protected AssemblyException(SerializationInfo info, StreamingContext context) : base(info, context) {}
+    }
+}
\ No newline at end of file
Fisheye: Tag deeb111cd648c41702c810d6b4f13ecc67098ccb refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Exceptions/AssemblyFactoryException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r19ca2288de4540bb03df71fc86cca6b456e8fc37 -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 19ca2288de4540bb03df71fc86cca6b456e8fc37)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -40,7 +40,7 @@
     <Compile Include="DikeProfiles\IHasForeshoreProfile.cs" />
     <Compile Include="DikeProfiles\IUseBreakWater.cs" />
     <Compile Include="DikeProfiles\IUseForeshore.cs" />
-    <Compile Include="Exceptions\AssemblyFactoryException.cs" />
+    <Compile Include="Exceptions\AssemblyException.cs" />
     <Compile Include="Exceptions\IllustrationPointConversionException.cs" />
     <Compile Include="Exceptions\MechanismSurfaceLineException.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerOneState.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs
===================================================================
diff -u -r77413ce11244a9aa8a12fd50aa8cee99bfe54476 -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision 77413ce11244a9aa8a12fd50aa8cee99bfe54476)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -84,7 +84,7 @@
         }
 
         [Test]
-        public void CreateAssessmentSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyFactoryException()
+        public void CreateAssessmentSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyException()
         {
             // Setup
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -97,7 +97,7 @@
                 TestDelegate test = () => AssemblyToolCategoriesFactory.CreateAssessmentSectionAssemblyCategories(0, 0);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(test);
+                var exception = Assert.Throws<AssemblyException>(test);
                 Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
                 Assert.AreEqual(exception.InnerException.Message, exception.Message);
             }
@@ -165,7 +165,7 @@
         }
 
         [Test]
-        public void CreateFailureMechanismSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyFactoryException()
+        public void CreateFailureMechanismSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyException()
         {
             // Setup
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -178,7 +178,7 @@
                 TestDelegate test = () => AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories(0, 0, 0, 0);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(test);
+                var exception = Assert.Throws<AssemblyException>(test);
                 Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
                 Assert.AreEqual(exception.InnerException.Message, exception.Message);
             }
@@ -246,7 +246,7 @@
         }
 
         [Test]
-        public void CreateGeotechnicFailureMechanismSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyFactoryException()
+        public void CreateGeotechnicFailureMechanismSectionAssemblyCategories_CalculatorThrowsException_ThrowsAssemblyException()
         {
             // Setup
             using (new AssemblyToolCalculatorFactoryConfig())
@@ -259,7 +259,7 @@
                 TestDelegate test = () => AssemblyToolCategoriesFactory.CreateGeotechnicFailureMechanismSectionAssemblyCategories(0, 0, 0, 0);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(test);
+                var exception = Assert.Throws<AssemblyException>(test);
                 Assert.IsInstanceOf<AssemblyCategoriesCalculatorException>(exception.InnerException);
                 Assert.AreEqual(exception.InnerException.Message, exception.Message);
             }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Exceptions/AssemblyExceptionTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Exceptions/AssemblyExceptionTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Exceptions/AssemblyExceptionTest.cs	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -0,0 +1,32 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Exceptions;
+
+namespace Ringtoets.Common.Data.Test.Exceptions
+{
+    [TestFixture]
+    public class AssemblyExceptionTest :
+        CustomExceptionDesignGuidelinesTestFixture<AssemblyException, Exception> {}
+}
\ No newline at end of file
Fisheye: Tag deeb111cd648c41702c810d6b4f13ecc67098ccb refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Exceptions/AssemblyFactoryExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r19ca2288de4540bb03df71fc86cca6b456e8fc37 -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 19ca2288de4540bb03df71fc86cca6b456e8fc37)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -39,7 +39,7 @@
     <Compile Include="DikeProfiles\DikeProfileTest.cs" />
     <Compile Include="DikeProfiles\ForeshoreProfileCollectionTest.cs" />
     <Compile Include="DikeProfiles\ForeshoreProfileTest.cs" />
-    <Compile Include="Exceptions\AssemblyFactoryExceptionTest.cs" />
+    <Compile Include="Exceptions\AssemblyExceptionTest.cs" />
     <Compile Include="Exceptions\IllustrationPointConversionExceptionTest.cs" />
     <Compile Include="Exceptions\MechanismSurfaceLineExceptionTest.cs" />
     <Compile Include="FailureMechanism\AssessmentLayerOneStateTest.cs" />
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -41,7 +41,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/> 
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(DuneErosionFailureMechanismSectionResult failureMechanismSectionResult)
         {
@@ -60,7 +60,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -95,7 +95,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -111,7 +111,7 @@
                 TestDelegate call = () => DuneErosionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -44,7 +44,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             GrassCoverErosionInwardsFailureMechanismSectionResult failureMechanismSectionResult)
@@ -64,7 +64,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -77,7 +77,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this calculation.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleDetailedAssembly(
             GrassCoverErosionInwardsFailureMechanismSectionResult failureMechanismSectionResult,
@@ -115,7 +115,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -101,7 +101,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -117,7 +117,7 @@
                 TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
@@ -259,7 +259,7 @@
         }
 
         [Test]
-        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             var random = new Random(21);
@@ -290,7 +290,7 @@
                     assessmentSection);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -41,7 +41,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             GrassCoverErosionOutwardsFailureMechanismSectionResult failureMechanismSectionResult)
@@ -61,7 +61,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -95,7 +95,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -111,7 +111,7 @@
                 TestDelegate call = () => GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -44,7 +44,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             HeightStructuresFailureMechanismSectionResult failureMechanismSectionResult)
@@ -63,7 +63,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -76,7 +76,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this calculation.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleDetailedAssembly(
             HeightStructuresFailureMechanismSectionResult failureMechanismSectionResult,
@@ -114,7 +114,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -101,7 +101,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -117,7 +117,7 @@
                 TestDelegate call = () => HeightStructuresFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
@@ -259,7 +259,7 @@
         }
 
         [Test]
-        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             var random = new Random(21);
@@ -290,7 +290,7 @@
                     assessmentSection);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             GrassCoverSlipOffInwardsFailureMechanismSectionResult failureMechanismSectionResult)
@@ -62,7 +62,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(GrassCoverSlipOffOutwardsFailureMechanismSectionResult failureMechanismSectionResult)
         {
@@ -61,7 +61,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             MacroStabilityOutwardsFailureMechanismSectionResult failureMechanismSectionResult)
@@ -62,7 +62,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(MicrostabilityFailureMechanismSectionResult failureMechanismSectionResult)
         {
@@ -60,7 +60,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(PipingStructureFailureMechanismSectionResult failureMechanismSectionResult)
         {
@@ -60,7 +60,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult failureMechanismSectionResult)
@@ -61,7 +61,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             TechnicalInnovationFailureMechanismSectionResult failureMechanismSectionResult)
@@ -61,7 +61,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -42,7 +42,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             WaterPressureAsphaltCoverFailureMechanismSectionResult failureMechanismSectionResult)
@@ -61,7 +61,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -113,7 +113,7 @@
                 TestDelegate call = () => GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -113,7 +113,7 @@
                 TestDelegate call = () => GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -113,7 +113,7 @@
                 TestDelegate call = () => MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -113,7 +113,7 @@
                 TestDelegate call = () => MicrostabilityFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -113,7 +113,7 @@
                 TestDelegate call = () => PipingStructureFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -98,7 +98,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -114,7 +114,7 @@
                 TestDelegate call = () => StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -113,7 +113,7 @@
                 TestDelegate call = () => TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -113,7 +113,7 @@
                 TestDelegate call = () => WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -45,7 +45,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             MacroStabilityInwardsFailureMechanismSectionResult failureMechanismSectionResult)
@@ -65,7 +65,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -79,7 +79,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this calculation.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleDetailedAssembly(
             MacroStabilityInwardsFailureMechanismSectionResult failureMechanismSectionResult,
@@ -124,7 +124,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -102,7 +102,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -118,7 +118,7 @@
                 TestDelegate call = () => MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
@@ -299,7 +299,7 @@
         }
 
         [Test]
-        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             var random = new Random(21);
@@ -334,7 +334,7 @@
                     assessmentSection);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -45,7 +45,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             PipingFailureMechanismSectionResult failureMechanismSectionResult)
@@ -65,7 +65,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -79,7 +79,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this calculation.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleDetailedAssembly(
             PipingFailureMechanismSectionResult failureMechanismSectionResult,
@@ -124,7 +124,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../PipingFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -103,7 +103,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -119,7 +119,7 @@
                 TestDelegate call = () => PipingFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
@@ -300,7 +300,7 @@
         }
 
         [Test]
-        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             var random = new Random(21);
@@ -335,7 +335,7 @@
                     assessmentSection);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -44,7 +44,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             StabilityPointStructuresFailureMechanismSectionResult failureMechanismSectionResult)
@@ -63,7 +63,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
 
@@ -76,7 +76,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> belonging to this calculation.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleDetailedAssembly(
             StabilityPointStructuresFailureMechanismSectionResult failureMechanismSectionResult,
@@ -114,7 +114,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -101,7 +101,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -117,7 +117,7 @@
                 TestDelegate call = () => StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
@@ -259,7 +259,7 @@
         }
 
         [Test]
-        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleDetailedAssembly_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             var random = new Random(21);
@@ -290,7 +290,7 @@
                     assessmentSection);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismSectionAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismSectionAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -41,7 +41,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             StabilityStoneCoverFailureMechanismSectionResult failureMechanismSectionResult)
@@ -61,7 +61,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -95,7 +95,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -111,7 +111,7 @@
                 TestDelegate call = () => StabilityStoneCoverFailureMechanismSectionAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r24e8ac9b5d1d0e28b83f64cea8ef926165d7619b -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision 24e8ac9b5d1d0e28b83f64cea8ef926165d7619b)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -41,7 +41,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/> based on the <paramref name="failureMechanismSectionResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismSectionResult"/>
         /// is <c>null</c>.</exception>
-        /// <exception cref="AssemblyFactoryException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
+        /// <exception cref="AssemblyException">Thrown when the <see cref="FailureMechanismSectionAssembly"/>
         /// could not be created.</exception>
         public static FailureMechanismSectionAssembly AssembleSimpleAssessment(
             WaveImpactAsphaltCoverFailureMechanismSectionResult failureMechanismSectionResult)
@@ -60,7 +60,7 @@
             }
             catch (FailureMechanismSectionAssemblyCalculatorException e)
             {
-                throw new AssemblyFactoryException(e.Message, e);
+                throw new AssemblyException(e.Message, e);
             }
         }
     }
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs
===================================================================
diff -u -re903fc0fcf884defda3849c2686dc0c2b9b71ddb -rdeeb111cd648c41702c810d6b4f13ecc67098ccb
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision e903fc0fcf884defda3849c2686dc0c2b9b71ddb)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
@@ -94,7 +94,7 @@
         }
 
         [Test]
-        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyFactoryException()
+        public void AssembleSimpleAssessment_CalculatorThrowsExceptions_ThrowsAssemblyException()
         {
             // Setup
             FailureMechanismSection failureMechanismSection = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
@@ -110,7 +110,7 @@
                 TestDelegate call = () => WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.AssembleSimpleAssessment(sectionResult);
 
                 // Assert
-                var exception = Assert.Throws<AssemblyFactoryException>(call);
+                var exception = Assert.Throws<AssemblyException>(call);
                 Exception innerException = exception.InnerException;
                 Assert.IsInstanceOf<FailureMechanismSectionAssemblyCalculatorException>(innerException);
                 Assert.AreEqual(innerException.Message, exception.Message);