1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 7cb680527..139d85493 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -459,7 +459,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="data">The data.</param>
         private void PopulateDiagnosticsData(StartDiagnosticsResponse data)
         {
-            if (data.Monitors == null) return;
+            if (data.Monitors == null || _machineOperator == null || _machineOperator.DeviceInformation == null) return;
 
             _diagnostics_index++;
             uint interval = _machineOperator.DeviceInformation.DiagnosticsInterval;