Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -rbb3a4dbfa4e43123f5b101034e90b89e8712bd41
--- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision bb3a4dbfa4e43123f5b101034e90b89e8712bd41)
@@ -61,7 +61,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Uitvoering van {0} is geannuleerd..
+        ///   Looks up a localized string similar to Uitvoering van &apos;{0}&apos; is geannuleerd..
         /// </summary>
         internal static string Activity_Run_Execution_of_0_has_been_canceled {
             get {
@@ -70,7 +70,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Uitvoering van {0} is mislukt..
+        ///   Looks up a localized string similar to Uitvoering van &apos;{0}&apos; is mislukt..
         /// </summary>
         internal static string Activity_Run_Execution_of_0_has_failed {
             get {
@@ -79,15 +79,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Initialisatie van {0} is mislukt..
-        /// </summary>
-        internal static string Activity_Run_Initialization_of_0_has_failed {
-            get {
-                return ResourceManager.GetString("Activity_Run_Initialization_of_0_has_failed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Stap {0} van {1}  |  {2}.
         /// </summary>
         internal static string FileImportActivity_ImportFromFile_Step_CurrentProgress_0_of_TotalProgress_1_____ProgressText_2 {
@@ -96,14 +87,5 @@
                         "rogressText_2", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Importeren {0}.
-        /// </summary>
-        internal static string FileImportActivity_Name_Import_using_importer_with_name_0 {
-            get {
-                return ResourceManager.GetString("FileImportActivity_Name_Import_using_importer_with_name_0", resourceCulture);
-            }
-        }
     }
 }
Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -rbb3a4dbfa4e43123f5b101034e90b89e8712bd41
--- Core/Common/src/Core.Common.Base/Properties/Resources.resx	(.../Resources.resx)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.resx	(.../Resources.resx)	(revision bb3a4dbfa4e43123f5b101034e90b89e8712bd41)
@@ -117,19 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Activity_Run_Initialization_of_0_has_failed" xml:space="preserve">
-    <value>Initialisatie van {0} is mislukt.</value>
-  </data>
   <data name="Activity_Run_Execution_of_0_has_been_canceled" xml:space="preserve">
-    <value>Uitvoering van {0} is geannuleerd.</value>
+    <value>Uitvoering van '{0}' is geannuleerd.</value>
   </data>
   <data name="Activity_Run_Execution_of_0_has_failed" xml:space="preserve">
-    <value>Uitvoering van {0} is mislukt.</value>
+    <value>Uitvoering van '{0}' is mislukt.</value>
   </data>
   <data name="FileImportActivity_ImportFromFile_Step_CurrentProgress_0_of_TotalProgress_1__|__ProgressText_2" xml:space="preserve">
     <value>Stap {0} van {1}  |  {2}</value>
   </data>
-  <data name="FileImportActivity_Name_Import_using_importer_with_name_0" xml:space="preserve">
-    <value>Importeren {0}</value>
-  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Service/Activity.cs
===================================================================
diff -u -rf0848e8a2e86a7c762a119f7d21c0e8c0223f85e -rbb3a4dbfa4e43123f5b101034e90b89e8712bd41
--- Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision f0848e8a2e86a7c762a119f7d21c0e8c0223f85e)
+++ Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision bb3a4dbfa4e43123f5b101034e90b89e8712bd41)
@@ -63,32 +63,12 @@
         /// </summary>
         public void Run()
         {
-            try
-            {
-                OnExecute();
+            ChangeState(OnExecute, ActivityStatus.Executed);
 
-                if (Status == ActivityStatus.Failed ||
-                    Status == ActivityStatus.Cancelled)
-                {
-                    // keep this status
-                    return;
-                }
-            }
-            catch (Exception e)
-            {
-                Status = ActivityStatus.Failed;
-                log.Error(e.Message);
-                return;
-            }
-
             if (Status == ActivityStatus.Failed)
             {
                 log.ErrorFormat(Resources.Activity_Run_Execution_of_0_has_failed, Name);
-
-                return;
             }
-
-            Status = ActivityStatus.Executed;
         }
 
         /// <summary>
@@ -97,6 +77,8 @@
         public void Cancel()
         {
             ChangeState(OnCancel, ActivityStatus.Cancelled);
+
+            log.WarnFormat(Resources.Activity_Run_Execution_of_0_has_been_canceled, Name);
         }
 
         /// <summary>
@@ -123,17 +105,17 @@
         protected abstract void OnExecute();
 
         /// <summary>
-        /// Activity has finished successfully. After calling this method, <see cref="Status"/> 
-        /// will be set to <see cref="ActivityStatus.Finished"/> if no error has occurred.
-        /// </summary>
-        protected abstract void OnFinish();
-
-        /// <summary>
         /// Cancels current run. <see cref="Status"/> will change to <see cref="ActivityStatus.Cancelled"/>
         /// after this method has been called.
         /// </summary>
         protected abstract void OnCancel();
 
+        /// <summary>
+        /// Activity has finished successfully. After calling this method, <see cref="Status"/> 
+        /// will be set to <see cref="ActivityStatus.Finished"/> if no error has occurred.
+        /// </summary>
+        protected abstract void OnFinish();
+
         private void OnProgressChanged()
         {
             if (ProgressChanged != null)
@@ -148,7 +130,7 @@
             {
                 transitionAction();
 
-                if (Status == ActivityStatus.Failed)
+                if (Status == ActivityStatus.Failed || Status == ActivityStatus.Cancelled)
                 {
                     return;
                 }
@@ -157,6 +139,7 @@
             {
                 Status = ActivityStatus.Failed;
                 log.Error(e.Message);
+
                 return;
             }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -rbb3a4dbfa4e43123f5b101034e90b89e8712bd41
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision bb3a4dbfa4e43123f5b101034e90b89e8712bd41)
@@ -49,15 +49,13 @@
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
             {
-                var msgs = messages.ToArray();
-                Assert.Greater(msgs.Length, 2, "Expecting more than 2 messages");
-
-                StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidPipingCalculation.Name), msgs.First());
-                foreach (var expectedValidationErrorMessage in msgs.Skip(1).Take(msgs.Length-2))
-                {
-                    StringAssert.StartsWith("Validatie mislukt: ", expectedValidationErrorMessage);
-                }
-                StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs.Last());
+                var msgs = messages.ToList();
+                Assert.AreEqual(msgs.Count, 5);
+                StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", invalidPipingCalculation.Name), msgs[0]);
+                StringAssert.StartsWith("Validatie mislukt: ", msgs[1]);
+                StringAssert.StartsWith("Validatie mislukt: ", msgs[2]);
+                StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs[3]);
+                StringAssert.StartsWith(String.Format("Uitvoering van '{0}' is mislukt.", invalidPipingCalculation.Name), msgs[4]);
             });
             Assert.AreEqual(ActivityStatus.Failed, activity.Status);
             Assert.AreEqual(originalOutput, invalidPipingCalculation.Output);