2 files changed, 9 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index f164d7f14..ee4435832 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -516,8 +516,14 @@ namespace Tango.MachineStudio.UI.ViewModels
                                         catch (Exception ex)
                                         {
                                             LogManager.Log(ex);
-                                            _eventLogger.Log(ex, "Error connecting to machine " + x.SelectedMachine.SerialNumber);
+
+                                            if (x.SelectedMachine != null)
+                                            {
+                                                _eventLogger.Log(ex, "Error connecting to machine " + x.SelectedMachine.SerialNumber);
+                                            }
+
                                             _notificationProvider.ShowError("Could not connect to the selected machine." + Environment.NewLine + ex.Message);
+
                                         }
 
                                         InvalidateRelayCommands();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
index 6dbc99591..b0279957c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs
@@ -322,9 +322,9 @@ namespace Tango.MachineStudio.UI.ViewModels
             try
             {
                 Process p = new Process();
-                p.StartInfo.FileName = _appPath + "\\Tango.MachineStudio.Updater.exe";
+                p.StartInfo.FileName = _newPackageTempFolder + "\\Tango.MachineStudio.Updater.exe";
                 p.StartInfo.UseShellExecute = true;
-                p.StartInfo.Arguments = _newPackageTempFolder;
+                p.StartInfo.Arguments = _appPath;
                 p.Start();
             }
             catch (Exception ex)