1 files changed, 10 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 165841905..c7c8335f0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -38,7 +38,16 @@ namespace Tango.MachineStudio.UI.ViewModels
         public IExternalBridgeClient SelectedMachine
         {
             get { return _selectedMachine; }
-            set { _selectedMachine = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(RequiresAuthentication)); InvalidateRelayCommands(); }
+            set
+            {
+                if (value != null)
+                {
+                    _selectedMachine = value;
+                    RaisePropertyChangedAuto();
+                    RaisePropertyChanged(nameof(RequiresAuthentication));
+                    InvalidateRelayCommands();
+                }
+            }
         }
 
         /// <summary>