Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Exceptions/CannotDeleteBackupFileException.cs
===================================================================
diff -u -rbdc1bbd84aa923749a80dfb0cf20f5bbcb54b3fc -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Exceptions/CannotDeleteBackupFileException.cs	(.../CannotDeleteBackupFileException.cs)	(revision bdc1bbd84aa923749a80dfb0cf20f5bbcb54b3fc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Exceptions/CannotDeleteBackupFileException.cs	(.../CannotDeleteBackupFileException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// The exception that is thrown when the original file cannot be restored by <see cref="BackedUpFileWriter"/>.
     /// </summary>
+    [Serializable]
     public class CannotDeleteBackupFileException : Exception
     {
         /// <summary>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Exceptions/EntityNotFoundException.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Exceptions/EntityNotFoundException.cs	(.../EntityNotFoundException.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Exceptions/EntityNotFoundException.cs	(.../EntityNotFoundException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// The exception that is thrown when an entity is not found.
     /// </summary>
+    [Serializable]
     public class EntityNotFoundException : Exception
     {
         /// <summary>
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs
===================================================================
diff -u -r1d86c8daf73d71b72c7a105b5f564ae7480a8d7f -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs	(.../DataCollectionSerializer.cs)	(revision 1d86c8daf73d71b72c7a105b5f564ae7480a8d7f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs	(.../DataCollectionSerializer.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -51,14 +51,16 @@
                 throw new ArgumentNullException("elements");
             }
 
-            using (var memoryStream = new MemoryStream())
+            var memoryStream = new MemoryStream();
+
             using (var writer = XmlDictionaryWriter.CreateTextWriter(memoryStream, encoding, false))
-            using (var streamReader = new StreamReader(memoryStream))
             {
                 var formatter = new DataContractSerializer(serializationRootType);
                 formatter.WriteObject(writer, ToSerializableData(elements));
                 writer.Flush();
-
+            }
+            using (var streamReader = new StreamReader(memoryStream))
+            {
                 memoryStream.Seek(0, SeekOrigin.Begin);
                 return streamReader.ReadToEnd();
             }
@@ -79,7 +81,7 @@
                 throw new ArgumentNullException("xml");
             }
 
-            using (var stream = new MemoryStream())
+            var stream = new MemoryStream();
             using (var streamWriter = new StreamWriter(stream, encoding))
             {
                 streamWriter.Write(xml);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs
===================================================================
diff -u -r1d86c8daf73d71b72c7a105b5f564ae7480a8d7f -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(.../StorageSqliteCreator.cs)	(revision 1d86c8daf73d71b72c7a105b5f564ae7480a8d7f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs	(.../StorageSqliteCreator.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -67,7 +67,6 @@
                         command.CommandText = Resources.DatabaseStructure;
                         command.ExecuteNonQuery();
                     }
-                    dbContext.Close();
                 }
             }
             catch (SQLiteException exception)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestDbSet.cs
===================================================================
diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestDbSet.cs	(.../TestDbSet.cs)	(revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestDbSet.cs	(.../TestDbSet.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -29,7 +29,7 @@
 
 namespace Application.Ringtoets.Storage.TestUtil
 {
-    public class TestDbSet<T> : DbSet<T>, IDbSet<T> where T : class
+    public sealed class TestDbSet<T> : DbSet<T>, IDbSet<T> where T : class
     {
         private readonly IQueryable<T> queryable;
         private readonly ObservableCollection<T> collection;
Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs
===================================================================
diff -u -re04155c0cc0efa8bbd13e0a82cb8643711a2dfd6 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs	(.../FileImporterBase.cs)	(revision e04155c0cc0efa8bbd13e0a82cb8643711a2dfd6)
+++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs	(.../FileImporterBase.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -41,7 +41,7 @@
         /// made to the data model unless the importer is already in progress of changing
         /// the data model.
         /// </summary>
-        protected bool ImportIsCancelled;
+        protected bool Canceled;
 
         public abstract string Name { get; }
         public abstract string Category { get; }
@@ -58,12 +58,12 @@
 
         public void Cancel()
         {
-            ImportIsCancelled = true;
+            Canceled = true;
         }
 
         public void DoPostImportUpdates(object targetItem)
         {
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 return;
             }
Index: Core/Common/src/Core.Common.Base/Service/Activity.cs
===================================================================
diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5)
+++ Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -106,12 +106,12 @@
 
         /// <summary>
         /// This method cancels a running <see cref="Activity"/>.
-        /// The <see cref="State"/> of a successfully cancelled <see cref="Activity"/> will become <see cref="ActivityState.Cancelled"/>.
+        /// The <see cref="State"/> of a successfully cancelled <see cref="Activity"/> will become <see cref="ActivityState.Canceled"/>.
         /// When the <see cref="Activity"/> cancel action fails, the <see cref="State"/> will become <see cref="ActivityState.Failed"/>.
         /// </summary>
         public void Cancel()
         {
-            ChangeState(OnCancel, ActivityState.Cancelled);
+            ChangeState(OnCancel, ActivityState.Canceled);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@
                 log.InfoFormat(Resources.Activity_Finish_Execution_of_ActivityName_0_has_succeeded, Name);
             }
 
-            if (State == ActivityState.Cancelled)
+            if (State == ActivityState.Canceled)
             {
                 log.WarnFormat(Resources.Activity_Finish_Execution_of_ActivityName_0_has_been_cancelled, Name);
             }
@@ -187,7 +187,7 @@
             {
                 transitionAction();
 
-                if (State == ActivityState.Failed || State == ActivityState.Cancelled || State == ActivityState.Skipped)
+                if (State == ActivityState.Failed || State == ActivityState.Canceled || State == ActivityState.Skipped)
                 {
                     return;
                 }
Index: Core/Common/src/Core.Common.Base/Service/ActivityState.cs
===================================================================
diff -u -rf12e91e657de5a8fdccce2c31d0e967e5aabdbe5 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Base/Service/ActivityState.cs	(.../ActivityState.cs)	(revision f12e91e657de5a8fdccce2c31d0e967e5aabdbe5)
+++ Core/Common/src/Core.Common.Base/Service/ActivityState.cs	(.../ActivityState.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -48,7 +48,7 @@
         /// The state of an <see cref="Activity"/> that is successfully cancelled.
         /// <seealso cref="Activity.Cancel"/>
         /// </summary>
-        Cancelled,
+        Canceled,
 
         /// <summary>
         /// The state of an <see cref="Activity"/> that is skipped during run.
Index: Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs
===================================================================
diff -u -r3ce8a0c103af363c8e00798d95588ebe4d1e04a5 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs	(.../CouldNotConnectException.cs)	(revision 3ce8a0c103af363c8e00798d95588ebe4d1e04a5)
+++ Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs	(.../CouldNotConnectException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// The exception that is thrown when a class is unable to connect.
     /// </summary>
+    [Serializable]
     public class CouldNotConnectException : StorageException
     {
         /// <summary>
Index: Core/Common/src/Core.Common.Base/Storage/StorageException.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Base/Storage/StorageException.cs	(.../StorageException.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Base/Storage/StorageException.cs	(.../StorageException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// The exception that is thrown when a storage execution failed.
     /// </summary>
+    [Serializable]
     public class StorageException : Exception
     {
         /// <summary>
Index: Core/Common/src/Core.Common.Base/Storage/UpdateStorageException.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Base/Storage/UpdateStorageException.cs	(.../UpdateStorageException.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Base/Storage/UpdateStorageException.cs	(.../UpdateStorageException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// The exception that is thrown when a database updater class encounters an error while
     /// parsing a row/line during the read.
     /// </summary>
+    [Serializable]
     public class UpdateStorageException : Exception
     {
         /// <summary>
Index: Core/Common/src/Core.Common.Geometry/InvalidPolygonException.cs
===================================================================
diff -u -r9b2c164b84e6bbdfdced4f8a1a1a9e023f078fc1 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Geometry/InvalidPolygonException.cs	(.../InvalidPolygonException.cs)	(revision 9b2c164b84e6bbdfdced4f8a1a1a9e023f078fc1)
+++ Core/Common/src/Core.Common.Geometry/InvalidPolygonException.cs	(.../InvalidPolygonException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// This exception can be used for when a polygon is not correctly defined.
     /// </summary>
+    [Serializable]
     public class InvalidPolygonException : Exception
     {
         /// <summary>
Index: Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilderException.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilderException.cs	(.../ContextMenuBuilderException.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilderException.cs	(.../ContextMenuBuilderException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// Exception thrown when something went wrong while initializing a <see cref="ContextMenuBuilder"/>.
     /// </summary>
+    [Serializable]
     public class ContextMenuBuilderException : Exception
     {
         /// <summary>
Index: Core/Common/src/Core.Common.IO/Exceptions/CriticalFileReadException.cs
===================================================================
diff -u -r6298a5e4fbc259636c874b25c847021c05baf033 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.IO/Exceptions/CriticalFileReadException.cs	(.../CriticalFileReadException.cs)	(revision 6298a5e4fbc259636c874b25c847021c05baf033)
+++ Core/Common/src/Core.Common.IO/Exceptions/CriticalFileReadException.cs	(.../CriticalFileReadException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// The exception that is thrown when a file reader class encounters a critical error
     /// during the read.
     /// </summary>
+    [Serializable]
     public class CriticalFileReadException : Exception
     {
         /// <summary>
Index: Core/Common/src/Core.Common.IO/Exceptions/CriticalFileWriteException.cs
===================================================================
diff -u -r437beb696991b6fbcdc58456f9d0c9361479a603 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.IO/Exceptions/CriticalFileWriteException.cs	(.../CriticalFileWriteException.cs)	(revision 437beb696991b6fbcdc58456f9d0c9361479a603)
+++ Core/Common/src/Core.Common.IO/Exceptions/CriticalFileWriteException.cs	(.../CriticalFileWriteException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// The exception that is thrown when a file writer class encounters a critical error
     /// during the write.
     /// </summary>
+    [Serializable]
     public class CriticalFileWriteException : Exception
     {
         /// <summary>
Index: Core/Common/src/Core.Common.IO/Exceptions/LineParseException.cs
===================================================================
diff -u -r151bab16a7ebc1bffc0621ab56c6dc219db1e90f -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.IO/Exceptions/LineParseException.cs	(.../LineParseException.cs)	(revision 151bab16a7ebc1bffc0621ab56c6dc219db1e90f)
+++ Core/Common/src/Core.Common.IO/Exceptions/LineParseException.cs	(.../LineParseException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// The exception that is thrown when a file reader class encounters an error while
     /// parsing a row/line during the read.
     /// </summary>
+    [Serializable]
     public class LineParseException : Exception
     {
         /// <summary>
Index: Core/Common/src/Core.Common.Utils/Exceptions/InvalidTypeParameterException.cs
===================================================================
diff -u -rea99af5c043eadf5c2ba83b82a847ae009181191 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/src/Core.Common.Utils/Exceptions/InvalidTypeParameterException.cs	(.../InvalidTypeParameterException.cs)	(revision ea99af5c043eadf5c2ba83b82a847ae009181191)
+++ Core/Common/src/Core.Common.Utils/Exceptions/InvalidTypeParameterException.cs	(.../InvalidTypeParameterException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// The exception that is thrown when a file reader class encounters an error while
     /// parsing a row/line during the read.
     /// </summary>
+    [Serializable]
     public class InvalidTypeParameterException : Exception
     {
         /// <summary>
Index: Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs
===================================================================
diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5)
+++ Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -97,7 +97,7 @@
             activity.Cancel();
 
             // Assert
-            Assert.AreEqual(ActivityState.Cancelled, activity.State);
+            Assert.AreEqual(ActivityState.Canceled, activity.State);
         }
 
         [Test]
@@ -180,7 +180,7 @@
                 "Uitvoeren van '' is geannuleerd."
             });
 
-            Assert.AreEqual(ActivityState.Cancelled, activity.State);
+            Assert.AreEqual(ActivityState.Canceled, activity.State);
         }
 
         [Test]
Index: Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs
===================================================================
diff -u -rde4477561032a5d95d5e65e50b719724466648ed -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs	(.../GuiTestHelper.cs)	(revision de4477561032a5d95d5e65e50b719724466648ed)
+++ Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs	(.../GuiTestHelper.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -155,6 +155,7 @@
         /// <summary>
         /// Defines unhandled exception which provides stack trace of inner exception as its stack trace.
         /// </summary>
+        [Serializable]
         public class UnhandledException : Exception
         {
             private readonly string stackTrace;
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Exceptions/PluginActivationException.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Exceptions/PluginActivationException.cs	(.../PluginActivationException.cs)	(revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Exceptions/PluginActivationException.cs	(.../PluginActivationException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// This class describes exceptions thrown when activating the plugin failed.
     /// </summary>
+    [Serializable]
     public class PluginActivationException : Exception
     {
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Exceptions/CriticalFileValidationException.cs
===================================================================
diff -u -r4baac94f94c8e7c05e0103b1b29c251c3418152b -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Common/src/Ringtoets.Common.IO/Exceptions/CriticalFileValidationException.cs	(.../CriticalFileValidationException.cs)	(revision 4baac94f94c8e7c05e0103b1b29c251c3418152b)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Exceptions/CriticalFileValidationException.cs	(.../CriticalFileValidationException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// The exception that is thrown when a file read successfully, but did not pass the validation process.
     /// </summary>
+    [Serializable]
     public class CriticalFileValidationException : Exception
     {
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs
===================================================================
diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision be66e1bec38a780abb27fedea8632acf4d24a173)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineImporter.cs	(.../ReferenceLineImporter.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -86,7 +86,7 @@
 
         public override bool Import(object targetItem, string filePath)
         {
-            ImportIsCancelled = false;
+            Canceled = false;
             changedObservables.Clear();
 
             bool clearReferenceLineDependentData = false;
@@ -97,7 +97,7 @@
                 clearReferenceLineDependentData = ConfirmImportOfReferenceLineToClearReferenceLineDependentData(importTarget.WrappedData);
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -111,7 +111,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -135,7 +135,7 @@
                                                   MessageBoxButtons.OKCancel);
             if (result == DialogResult.Cancel)
             {
-                ImportIsCancelled = true;
+                Canceled = true;
             }
             else
             {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporter/DikeProfilesImporter.cs
===================================================================
diff -u -r53aef346fd0ee3cc79d1f5df9171c476453f2935 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporter/DikeProfilesImporter.cs	(.../DikeProfilesImporter.cs)	(revision 53aef346fd0ee3cc79d1f5df9171c476453f2935)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporter/DikeProfilesImporter.cs	(.../DikeProfilesImporter.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -109,7 +109,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -122,7 +122,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -166,7 +166,7 @@
             int totalNumberOfSteps = dikeProfileLocationReader.GetLocationCount;
             for (int i = 0; i < totalNumberOfSteps; i++)
             {
-                if (ImportIsCancelled)
+                if (Canceled)
                 {
                     return new ReadResult<DikeProfileLocation>(false);
                 }
@@ -236,7 +236,7 @@
 
             for (int i = 0; i < totalNumberOfSteps; i++)
             {
-                if (ImportIsCancelled)
+                if (Canceled)
                 {
                     return new ReadResult<DikeProfileData>(false);
                 }
@@ -344,7 +344,7 @@
         private void HandleUserCancellingImport()
         {
             log.Info(Resources.DikeProfilesImporter_HandleUserCancellingImport_dikeprofile_import_aborted);
-            ImportIsCancelled = false;
+            Canceled = false;
         }
 
         private static bool IsReferenceLineAvailable(object targetItem)
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Exceptions/HydraulicBoundaryDatabaseReadException.cs
===================================================================
diff -u -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Exceptions/HydraulicBoundaryDatabaseReadException.cs	(.../HydraulicBoundaryDatabaseReadException.cs)	(revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Exceptions/HydraulicBoundaryDatabaseReadException.cs	(.../HydraulicBoundaryDatabaseReadException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// Represents errors that occur while reading a hydraulic boundary database.
     /// </summary>
+    [Serializable]
     public class HydraulicBoundaryDatabaseReadException : Exception
     {
         /// <summary>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/FailureMechanismSectionsImporter.cs
===================================================================
diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/FailureMechanismSectionsImporter.cs	(.../FailureMechanismSectionsImporter.cs)	(revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/FailureMechanismSectionsImporter.cs	(.../FailureMechanismSectionsImporter.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -88,7 +88,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -101,7 +101,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -116,7 +116,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -135,7 +135,7 @@
         private void HandleUserCancellingImport()
         {
             log.Info(Resources.FailureMechanismSectionsImporter_Import_cancelled_no_data_read);
-            ImportIsCancelled = false;
+            Canceled = false;
         }
 
         private ReadResult<FailureMechanismSection> ReadFailureMechanismSections(string filePath)
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayerConversionException.cs
===================================================================
diff -u -rcb6877f670bacc7a6a896ab132d592eeef1107b5 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayerConversionException.cs	(.../SoilLayerConversionException.cs)	(revision cb6877f670bacc7a6a896ab132d592eeef1107b5)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayerConversionException.cs	(.../SoilLayerConversionException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// <summary>
     /// Exception thrown when something went wrong while converting soil layers for a <see cref="PipingSoilProfile"/>.
     /// </summary>
+    [Serializable]
     public class SoilLayerConversionException : Exception
     {
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilderException.cs
===================================================================
diff -u -rd82fa09fe9ae053ce7702ba89ef23ae029640d1b -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilderException.cs	(.../SoilProfileBuilderException.cs)	(revision d82fa09fe9ae053ce7702ba89ef23ae029640d1b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilderException.cs	(.../SoilProfileBuilderException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// <summary>
     /// Exception thrown when something went wrong while building a <see cref="PipingSoilProfile"/>.
     /// </summary>
+    [Serializable]
     public class SoilProfileBuilderException : Exception
     {
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/PipingSoilProfileReadException.cs
===================================================================
diff -u -rd82fa09fe9ae053ce7702ba89ef23ae029640d1b -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/PipingSoilProfileReadException.cs	(.../PipingSoilProfileReadException.cs)	(revision d82fa09fe9ae053ce7702ba89ef23ae029640d1b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/PipingSoilProfileReadException.cs	(.../PipingSoilProfileReadException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -28,6 +28,7 @@
     /// <summary>
     /// Exception thrown when something went wrong while reading <see cref="PipingSoilProfile"/> in <see cref="PipingSoilProfileReader"/>.
     /// </summary>
+    [Serializable]
     public class PipingSoilProfileReadException : Exception
     {
         private readonly string ProfileNameKey = "ProfileName";
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/StochasticSoilProfileReadException.cs
===================================================================
diff -u -rd82fa09fe9ae053ce7702ba89ef23ae029640d1b -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/StochasticSoilProfileReadException.cs	(.../StochasticSoilProfileReadException.cs)	(revision d82fa09fe9ae053ce7702ba89ef23ae029640d1b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/StochasticSoilProfileReadException.cs	(.../StochasticSoilProfileReadException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// The exception that is thrown when failed to read a <see cref="Ringtoets.Piping.Data.StochasticSoilProfile"/> from the DSoil-database.
     /// </summary>
+    [Serializable]
     public class StochasticSoilProfileReadException : Exception
     {
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorException.cs
===================================================================
diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorException.cs	(.../PipingCalculatorException.cs)	(revision c2fe76d04e1517a4e0aaf62184bccd413de0e472)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorException.cs	(.../PipingCalculatorException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// Exception thrown when something went wrong in the <see cref="PipingCalculator"/>
     /// </summary>
+    [Serializable]
     public class PipingCalculatorException : Exception
     {
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingProfileCreatorException.cs
===================================================================
diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingProfileCreatorException.cs	(.../PipingProfileCreatorException.cs)	(revision c2fe76d04e1517a4e0aaf62184bccd413de0e472)
+++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingProfileCreatorException.cs	(.../PipingProfileCreatorException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -26,6 +26,7 @@
     /// <summary>
     /// Exception thrown when something went wrong in the <see cref="PipingCalculator"/>
     /// </summary>
+    [Serializable]
     public class PipingProfileCreatorException : Exception
     {
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs	(.../PipingSoilProfilesImporter.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs	(.../PipingSoilProfilesImporter.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -101,7 +101,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -113,7 +113,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -123,7 +123,7 @@
 
             CheckIfAllProfilesAreUsed(importSoilProfileResult.ImportedItems, importStochasticSoilModelResult.ImportedItems);
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -229,7 +229,7 @@
         {
             log.Info(RingtoetsPluginResources.PipingSoilProfilesImporter_Import_Import_cancelled);
 
-            ImportIsCancelled = false;
+            Canceled = false;
         }
 
         #region read stochastic soil models
@@ -259,7 +259,7 @@
             var soilModels = new Collection<StochasticSoilModel>();
             while (stochasticSoilModelReader.HasNext)
             {
-                if (ImportIsCancelled)
+                if (Canceled)
                 {
                     return new ReadResult<StochasticSoilModel>(false);
                 }
@@ -309,7 +309,7 @@
             var profiles = new Collection<PipingSoilProfile>();
             while (soilProfileReader.HasNext)
             {
-                if (ImportIsCancelled)
+                if (Canceled)
                 {
                     return new ReadResult<PipingSoilProfile>(false);
                 }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs	(.../PipingSurfaceLinesCsvImporter.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -114,7 +114,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -126,7 +126,7 @@
                 return false;
             }
 
-            if (ImportIsCancelled)
+            if (Canceled)
             {
                 HandleUserCancellingImport();
                 return false;
@@ -292,7 +292,7 @@
         {
             log.Info(RingtoetsPluginResources.PipingSurfaceLinesCsvImporter_Import_Import_cancelled);
 
-            ImportIsCancelled = false;
+            Canceled = false;
         }
 
         private class ReferenceLineIntersectionResult
@@ -359,7 +359,7 @@
             NotifyProgress(stepName, 0, itemCount);
 
             var readSurfaceLines = new List<RingtoetsPipingSurfaceLine>(itemCount);
-            for (int i = 0; i < itemCount && !ImportIsCancelled; i++)
+            for (int i = 0; i < itemCount && !Canceled; i++)
             {
                 try
                 {
@@ -517,7 +517,7 @@
             NotifyProgress(stepName, 0, itemCount);
 
             var readCharacteristicPointsLocations = new List<CharacteristicPoints>(itemCount);
-            for (int i = 0; i < itemCount && !ImportIsCancelled; i++)
+            for (int i = 0; i < itemCount && !Canceled; i++)
             {
                 try
                 {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Exceptions/RingtoetsPipingSurfaceLineException.cs
===================================================================
diff -u -rd82fa09fe9ae053ce7702ba89ef23ae029640d1b -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5
--- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Exceptions/RingtoetsPipingSurfaceLineException.cs	(.../RingtoetsPipingSurfaceLineException.cs)	(revision d82fa09fe9ae053ce7702ba89ef23ae029640d1b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Exceptions/RingtoetsPipingSurfaceLineException.cs	(.../RingtoetsPipingSurfaceLineException.cs)	(revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5)
@@ -27,6 +27,7 @@
     /// The exception that is thrown when operations on <see cref="RingtoetsPipingSurfaceLine"/> encounter 
     /// an error.
     /// </summary>
+    [Serializable]
     public class RingtoetsPipingSurfaceLineException : Exception
     {
         /// <summary>