1 files changed, 6 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 6303b1ac8..ccedde974 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -362,6 +362,12 @@ namespace Tango.MachineStudio.UI.StudioApplication
             if (connectedMachine != null)
             {
                 Machine = ObservablesStaticCollections.Instance.Machines.SingleOrDefault(x => x.SerialNumber == connectedMachine.SerialNumber);
+
+                if (Machine == null)
+                {
+                    throw new NullReferenceException($"The specified machine '{connectedMachine.SerialNumber}' could not be found on the database.");
+                }
+
                 ConnectedMachine = connectedMachine;
                 ConnectedMachine.SetMachine(Machine);
             }