1 files changed, 9 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 3ffb6f634..61ddfdb2b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -119,7 +119,15 @@ namespace Tango.PPC.Common.Connection
                                 MachineOperator.Adapter = response.Adapter;
                                 MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                                 LogManager.Log("Connecting machine operator...", LogCategory.Debug);
-                                await MachineOperator.Connect();
+                                try
+                                {
+                                    await MachineOperator.Connect();
+                                }
+                                catch (Exception)
+                                {
+                                    await response.Adapter.Disconnect();
+                                    throw;
+                                }
 
 
                                 await Task.Delay(1000);