1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index ab74fcca8..83ebde0e5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -700,11 +700,15 @@ namespace Tango.MachineStudio.Developer.ViewModels
             _colorConversionThread.Start();
         }
 
+        #endregion
+
+        #region Color Conversion
+
         private void ColorConversionThreadMethod()
         {
             while (true)
             {
-                if (IsVisible && ActiveJob != null)
+                if (IsVisible && ActiveJob != null && ActiveJob.Segments != null)
                 {
                     var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops);