1 files changed, 7 insertions, 0 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 81f47c4ba..d0bddf3f2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -37,6 +37,7 @@ using Tango.Settings;
 using Tango.SharedUI;
 using Tango.SharedUI.Controls;
 using Tango.SharedUI.Helpers;
+using Tango.Transport;
 using Tango.Transport.Adapters;
 
 namespace Tango.MachineStudio.UI.ViewModels
@@ -471,6 +472,12 @@ namespace Tango.MachineStudio.UI.ViewModels
                                         _eventLogger.Log(String.Format("Successfully connected to machine {0} via TCP", x.SelectedMachine.SerialNumber));
 
                                     }
+                                    catch (ResponseErrorException ex)
+                                    {
+                                        LogManager.Log(ex);
+                                        _eventLogger.Log(ex, "Error connecting to machine " + x.SelectedMachine.SerialNumber);
+                                        _notificationProvider.ShowError("Could not connect to the selected machine." + Environment.NewLine + ex.Container.ErrorMessage);
+                                    }
                                     catch (Exception ex)
                                     {
                                         LogManager.Log(ex);