1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs
index 8004ef154..92d176671 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml.cs
@@ -44,7 +44,11 @@ namespace Tango.MachineStudio.Logging.Views
         private void ItemsControl_SizeChanged(object sender, SizeChangedEventArgs e)
         {
             TimelineEventGroup group = (sender as FrameworkElement).DataContext as TimelineEventGroup;
-            group.Height = e.NewSize.Height;
+
+            if (group != null)
+            {
+                group.Height = e.NewSize.Height;
+            }
         }
 
         private void scrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)