diff --git a/README.md b/README.md
index d648c021..c7477698 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Sitecore Instance Manager (SIM 1.5)
+# Sitecore Instance Manager (SIM 1.6)
 
-**SIM 1.5 is an open source tool** for managing the local park of Sitecore instances. You can install, locate, maintain, reinstall or delete Sitecore products. It has API and plugin engine so you can extend it for any your need. 
+**SIM 1.6 is an open source tool** for managing the local park of Sitecore instances. You can install, locate, maintain, reinstall or delete Sitecore products. It has API and plugin engine so you can extend it for any your need. 
 
-### [Download SIM 1.5](http://dl.sitecore.net/updater/sim) as a ClickOnce app
+### [Download SIM 1.6](http://dl.sitecore.net/updater/sim/v2) as a ClickOnce app
 
 ### Resources
 
diff --git a/src/SIM.Tool.Base/Windows/Wizard.xaml.cs b/src/SIM.Tool.Base/Windows/Wizard.xaml.cs
index bd93e445..57215819 100644
--- a/src/SIM.Tool.Base/Windows/Wizard.xaml.cs
+++ b/src/SIM.Tool.Base/Windows/Wizard.xaml.cs
@@ -500,6 +500,7 @@ private void FinishUnsafe([NotNull] string message, bool allDone)
 
         if (allDone)
         {
+          WizardPipeline.AfterLastStep?.Execute(this.WizardArgs);
           AddFinishActions(WizardPipeline._FinishActions);
 
           if (WizardPipeline._FinishActionHives != null)
@@ -648,6 +649,13 @@ private void InitializeStep(int? i = null)
           {
             pipelineName = _ProcessorArgs.PipelineName;
           }        
+            
+          if (!PipelineManager.Definitions.ContainsKey(WizardPipeline.Name))
+          {
+            Finish("Done.", true);
+
+            return;
+          }
 
           PipelineManager.StartPipeline(pipelineName, _ProcessorArgs, this);
           backButton.Visibility = Visibility.Hidden;