diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j
index 58f5cb152..a9ec28a28 100644
--- a/AppKit/CPTableHeaderView.j
+++ b/AppKit/CPTableHeaderView.j
@@ -466,9 +466,12 @@ var CPTableHeaderViewResizeZone = 3.0,
 - (void)updateTrackingAreas
 {
     [self removeAllTrackingAreas];
-    
+
     var options = CPTrackingCursorUpdate | CPTrackingActiveInKeyWindow;
-    
+
+    if (!_tableView)
+      return;
+
     for (var i = 0; i < _tableView._tableColumns.length; i++)
         [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:[self _cursorRectForColumn:i]
                                                            options:options