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 70378a4d5..d1f9cda64 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -453,6 +453,13 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                         if (x.SelectedMachine.RequiresAuthentication)
                         {
+                            //Check machine exist on my database first
+                            if (!ObservablesStaticCollections.Instance.Machines.ToList().Exists(y => y.SerialNumber == x.SelectedMachine.SerialNumber))
+                            {
+                                _notificationProvider.ShowError( $"The specified machine '{x.SelectedMachine.SerialNumber}' could not be found on the database.");
+                                return;
+                            }
+
                             _notificationProvider.ShowModalDialog<MachineLoginViewVM>(async (login) =>
                             {
                                 using (NotificationProvider.PushTaskItem("Connecting to machine " + x.SelectedMachine.ToString() + "..."))