Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PolyLine.cs
===================================================================
diff -u -r2118 -r2127
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PolyLine.cs	(.../PolyLine.cs)	(revision 2118)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PolyLine.cs	(.../PolyLine.cs)	(revision 2127)
@@ -27,19 +27,6 @@
 
 namespace Deltares.DamEngine.Data.General
 {
-    /// <summary>
-    /// Exception class for poly line
-    /// </summary>
-    /// <seealso cref="System.Exception" />
-    public class PolyLineException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PolyLineException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public PolyLineException(string message) : base(message) { }
-    }
-
     public class PolyLine<T> where T : GeometryPoint, new()
     {
         protected IList<T> points;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs
===================================================================
diff -u -r2118 -r2127
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 2118)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 2127)
@@ -35,19 +35,6 @@
 namespace Deltares.DamEngine.Data.General
 {
     /// <summary>
-    /// Exception class for the Dike class
-    /// </summary>
-    /// <seealso cref="System.Exception" />
-    public class DikeException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DikeException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public DikeException(string message) : base(message) { }
-    }
-
-    /// <summary>
     /// Class for the dike parameter names
     /// </summary>
     public class DikeParameterNames
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
===================================================================
diff -u -r2118 -r2127
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 2118)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 2127)
@@ -34,19 +34,6 @@
 namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
 {
     /// <summary>
-    /// Class for raising specified exceptions for MStabXmlDoc objects
-    /// </summary>
-    /// <seealso cref="System.Exception" />
-    public class MStabXmlDocException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MStabXmlDocException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public MStabXmlDocException(string message) : base(message) { }
-    }
-
-    /// <summary>
     /// Class for creating the xml-file for stability calculations using DGeoStability Delphi.
     /// </summary>
     public static class MStabXmlDoc
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r2113 -r2127
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 2113)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 2127)
@@ -40,8 +40,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="General\DikeException.cs" />
     <Compile Include="General\EmbankmentDesignParameters.cs" />
     <Compile Include="General\Physics.cs" />
+    <Compile Include="General\PolyLineException.cs" />
     <Compile Include="General\Results\DesignResult.cs" />
     <Compile Include="Design\DesignScenario.cs" />
     <Compile Include="General\DAMEnumerations.cs" />
@@ -97,6 +99,7 @@
     <Compile Include="General\TimeSeries\TimeStep.cs" />
     <Compile Include="General\UpliftSituation.cs" />
     <Compile Include="Geometry\CoordinateSystemConverter.cs" />
+    <Compile Include="Geometry\CoordinateSystemConverterException.cs" />
     <Compile Include="Geometry\GeometryBounds.cs" />
     <Compile Include="Geometry\GeometryConstants.cs" />
     <Compile Include="Geometry\GeometryCurve.cs" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/CoordinateSystemConverterException.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/CoordinateSystemConverterException.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/CoordinateSystemConverterException.cs	(revision 2127)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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;
+
+namespace Deltares.DamEngine.Data.Geometry
+{
+    /// <summary>
+    /// Exception class for <see cref="CoordinateSystemConverter"/>.
+    /// </summary>
+    public class CoordinateSystemConverterException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CoordinateSystemConverterException"/> class.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public CoordinateSystemConverterException(string message) : base(message) { }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocException.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocException.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocException.cs	(revision 2127)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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;
+
+namespace Deltares.DamEngine.Calculators.KernelWrappers.DamMacroStabilityCommon
+{
+    /// <summary>
+    /// Class for raising specified exceptions for MStabXmlDoc objects
+    /// </summary>
+    /// <seealso cref="System.Exception" />
+    public class MStabXmlDocException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MStabXmlDocException"/> class.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public MStabXmlDocException(string message) : base(message) { }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DikeException.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DikeException.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DikeException.cs	(revision 2127)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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;
+
+namespace Deltares.DamEngine.Data.General
+{
+    /// <summary>
+    /// Exception class for the Dike class
+    /// </summary>
+    /// <seealso cref="System.Exception" />
+    public class DikeException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DikeException"/> class.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public DikeException(string message) : base(message) { }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PolyLineException.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PolyLineException.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PolyLineException.cs	(revision 2127)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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;
+
+namespace Deltares.DamEngine.Data.General
+{
+    /// <summary>
+    /// Exception class for poly line
+    /// </summary>
+    /// <seealso cref="System.Exception" />
+    public class PolyLineException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PolyLineException"/> class.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public PolyLineException(string message) : base(message) { }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r2126 -r2127
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 2126)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 2127)
@@ -98,6 +98,7 @@
     <Compile Include="DikesOperational\OperationalCalculator.cs" />
     <Compile Include="DikesOperational\OperationalCalculatorException.cs" />
     <Compile Include="DikesOperational\OperationalCalculatorTask.cs" />
+    <Compile Include="KernelWrappers\DamMacroStabilityCommon\MStabXmlDocException.cs" />
     <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\ConversionHelper.cs" />
     <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\FillDamEngineFromWti.cs" />
     <Compile Include="KernelWrappers\MacroStabilityCommon\MacroStabilityIo\FillWtiKernelData.cs" />
@@ -197,6 +198,7 @@
     <Compile Include="Stability\StabilityServiceAgent.cs" />
     <Compile Include="Stability\StabilityServiceAgentException.cs" />
     <Compile Include="Uplift\SoilVolumicMassCalculator.cs" />
+    <Compile Include="Uplift\SoilVolumicMassCalculatorException.cs" />
     <Compile Include="Uplift\UpliftCalculator.cs" />
     <Compile Include="Uplift\UpliftLocationAndResult.cs" />
     <Compile Include="Uplift\UpliftLocationDeterminator.cs" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculatorException.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculatorException.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculatorException.cs	(revision 2127)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero 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;
+
+namespace Deltares.DamEngine.Calculators.Uplift
+{
+    /// <summary>
+    /// Exception class for SoilVolumicMassCalculator
+    /// </summary>
+    public class SoilVolumicMassCalculatorException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SoilVolumicMassCalculatorException"/> class.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public SoilVolumicMassCalculatorException(string message) : base(message) { }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/CoordinateSystemConverter.cs
===================================================================
diff -u -r2118 -r2127
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/CoordinateSystemConverter.cs	(.../CoordinateSystemConverter.cs)	(revision 2118)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/CoordinateSystemConverter.cs	(.../CoordinateSystemConverter.cs)	(revision 2127)
@@ -24,18 +24,6 @@
 namespace Deltares.DamEngine.Data.Geometry
 {
     /// <summary>
-    /// Exception class for <see cref="CoordinateSystemConverter"/>.
-    /// </summary>
-    public class CoordinateSystemConverterException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CoordinateSystemConverterException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public CoordinateSystemConverterException(string message) : base(message) { }
-    }
-
-    /// <summary>
     /// class for converting object coordinates from global to local system and back.
     /// </summary>
     /// <remarks>Converter assumes all points of the given line are in the same vertical 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculator.cs
===================================================================
diff -u -r2118 -r2127
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculator.cs	(.../SoilVolumicMassCalculator.cs)	(revision 2118)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/SoilVolumicMassCalculator.cs	(.../SoilVolumicMassCalculator.cs)	(revision 2127)
@@ -28,18 +28,6 @@
 namespace Deltares.DamEngine.Calculators.Uplift
 {
     /// <summary>
-    /// Exception class for SoilVolumicMassCalculator
-    /// </summary>
-    public class SoilVolumicMassCalculatorException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SoilVolumicMassCalculatorException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public SoilVolumicMassCalculatorException(string message) : base(message) { }
-    }
-
-    /// <summary>
     /// Calculation class to determine weight of the soil between TopOfLayerToBeEvaluated and SurfaceLevel
     /// </summary>
     public class SoilVolumicMassCalculator