Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,6 @@
 using Assembly.Kernel.Old.Model;
 using Assembly.Kernel.Old.Model.CategoryLimits;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 
Fisheye: Tag 58ff9e025291ded923f4d56274d743e9ab47043d refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,6 @@
 using Assembly.Kernel.Old.Model;
 using Assembly.Kernel.Old.Model.CategoryLimits;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 
Fisheye: Tag 58ff9e025291ded923f4d56274d743e9ab47043d refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -red4ca910fa06819e11dcc94a46b3632f19a22823 -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision ed4ca910fa06819e11dcc94a46b3632f19a22823)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,6 @@
 using Assembly.Kernel.Model.Categories;
 using Assembly.Kernel.Model.FailurePathSections;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 
Fisheye: Tag 58ff9e025291ded923f4d56274d743e9ab47043d refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOld.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOld.cs	(.../FailureMechanismSectionAssemblyCalculatorOld.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOld.cs	(.../FailureMechanismSectionAssemblyCalculatorOld.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,6 @@
 using Assembly.Kernel.Old.Model.CategoryLimits;
 using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Primitives;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailurePathAssemblyCalculator.cs
===================================================================
diff -u -rf85d794366242406196101d825856b6e793523b4 -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailurePathAssemblyCalculator.cs	(.../FailurePathAssemblyCalculator.cs)	(revision f85d794366242406196101d825856b6e793523b4)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailurePathAssemblyCalculator.cs	(.../FailurePathAssemblyCalculator.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,6 @@
 using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.FailurePathSections;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -r58ff9e025291ded923f4d56274d743e9ab47043d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision 58ff9e025291ded923f4d56274d743e9ab47043d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly
 {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs	(.../IFailureMechanismAssemblyCalculator.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs	(.../IFailureMechanismAssemblyCalculator.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly
 {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r247dae61ffc4218bf9d2584560864f9534a86d37 -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs	(.../IFailureMechanismSectionAssemblyCalculator.cs)	(revision 247dae61ffc4218bf9d2584560864f9534a86d37)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs	(.../IFailureMechanismSectionAssemblyCalculator.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -21,7 +21,6 @@
 
 using System;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly
 {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculatorOld.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculatorOld.cs	(.../IFailureMechanismSectionAssemblyCalculatorOld.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculatorOld.cs	(.../IFailureMechanismSectionAssemblyCalculatorOld.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -22,7 +22,6 @@
 using System;
 using System.ComponentModel;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.Common.Primitives;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly
Fisheye: Tag efffeffbef15761667281ffcf6b2cb48280e4a29 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Exceptions/AssessmentSectionAssemblyCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag efffeffbef15761667281ffcf6b2cb48280e4a29 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Exceptions/FailureMechanismAssemblyCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag efffeffbef15761667281ffcf6b2cb48280e4a29 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Exceptions/FailureMechanismSectionAssemblyCalculatorException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj
===================================================================
diff -u -r58ff9e025291ded923f4d56274d743e9ab47043d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.csproj)	(revision 58ff9e025291ded923f4d56274d743e9ab47043d)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.csproj)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
-      <Reference Include="Assembly.Kernel.Old">
-          <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll</HintPath>
-      </Reference>
-      <Reference Include="Assembly.Kernel">
-          <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll</HintPath>
-      </Reference>
-      <Reference Include="System"/>
-      <Reference Include="System.Core"/>
+    <Reference Include="Assembly.Kernel.Old">
+      <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll</HintPath>
+    </Reference>
+    <Reference Include="Assembly.Kernel">
+      <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll</HintPath>
+    </Reference>
+    <Reference Include="System"/>
+    <Reference Include="System.Core"/>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag 58ff9e025291ded923f4d56274d743e9ab47043d refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs	(.../AssessmentSectionAssemblyCalculatorTest.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs	(.../AssessmentSectionAssemblyCalculatorTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -30,7 +30,6 @@
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
Fisheye: Tag 58ff9e025291ded923f4d56274d743e9ab47043d refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -31,7 +31,6 @@
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
Fisheye: Tag 58ff9e025291ded923f4d56274d743e9ab47043d refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOldTest.cs
===================================================================
diff -u -r73dcfebc1d95b398d477e77956e4e80f1000093d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOldTest.cs	(.../FailureMechanismSectionAssemblyCalculatorOldTest.cs)	(revision 73dcfebc1d95b398d477e77956e4e80f1000093d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOldTest.cs	(.../FailureMechanismSectionAssemblyCalculatorOldTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -31,7 +31,6 @@
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -red4ca910fa06819e11dcc94a46b3632f19a22823 -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision ed4ca910fa06819e11dcc94a46b3632f19a22823)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -30,7 +30,6 @@
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailurePathAssemblyCalculatorTest.cs
===================================================================
diff -u -rf85d794366242406196101d825856b6e793523b4 -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailurePathAssemblyCalculatorTest.cs	(.../FailurePathAssemblyCalculatorTest.cs)	(revision f85d794366242406196101d825856b6e793523b4)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailurePathAssemblyCalculatorTest.cs	(.../FailurePathAssemblyCalculatorTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -31,7 +31,6 @@
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
Fisheye: Tag efffeffbef15761667281ffcf6b2cb48280e4a29 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Exceptions/AssessmentSectionAssemblyCalculatorExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag efffeffbef15761667281ffcf6b2cb48280e4a29 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Exceptions/FailureMechanismAssemblyCalculatorExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag efffeffbef15761667281ffcf6b2cb48280e4a29 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Exceptions/FailureMechanismSectionAssemblyCalculatorExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -rea195062546c9510b475b468797bea8f20bb4cbe -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision ea195062546c9510b475b468797bea8f20bb4cbe)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -15,14 +15,14 @@
       <Link>Copying.licenseheader</Link>
     </None>
   </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
-        <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
-        <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
-        <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
-        <ProjectReference Include="..\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
-    </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj"/>
+    <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj"/>
+    <ProjectReference Include="..\Riskeer.AssemblyTool.KernelWrapper.TestUtil\Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj"/>
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
     </PackageReference>
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -r58ff9e025291ded923f4d56274d743e9ab47043d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision 58ff9e025291ded923f4d56274d743e9ab47043d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly
 {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs	(.../FailureMechanismAssemblyCalculatorStub.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs	(.../FailureMechanismAssemblyCalculatorStub.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly
 {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOldStub.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOldStub.cs	(.../FailureMechanismSectionAssemblyCalculatorOldStub.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorOldStub.cs	(.../FailureMechanismSectionAssemblyCalculatorOldStub.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -22,7 +22,6 @@
 using System;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.Common.Primitives;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismAssemblyFactory.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs	(.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismAssemblyFactoryTest.cs	(.../ClosingStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismAssemblyFactoryTest.cs	(.../DuneErosionFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs
===================================================================
diff -u -r58ff9e025291ded923f4d56274d743e9ab47043d -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs	(.../AssessmentSectionAssemblyFactory.cs)	(revision 58ff9e025291ded923f4d56274d743e9ab47043d)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs	(.../AssessmentSectionAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.ClosingStructures.Data;
 using Riskeer.Common.Data.Contribution;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using Rhino.Mocks;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactoryTest.cs	(.../MicrostabilityFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactoryTest.cs	(.../PipingStructureFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -26,7 +26,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r247dae61ffc4218bf9d2584560864f9534a86d37 -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision 247dae61ffc4218bf9d2584560864f9534a86d37)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r26259e86f36858575c3307e3a97602a899026bbf -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision 26259e86f36858575c3307e3a97602a899026bbf)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.Data.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,6 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc -refffeffbef15761667281ffcf6b2cb48280e4a29
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactoryTest.cs)	(revision efffeffbef15761667281ffcf6b2cb48280e4a29)
@@ -25,7 +25,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
-using Riskeer.AssemblyTool.KernelWrapper.Calculators.Exceptions;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.Common.Data.AssemblyTool;