diff --git a/SplitViewSidebar/FixedSidebarSplitViewController.m b/SplitViewSidebar/FixedSidebarSplitViewController.m
index 5a50bc5..4d102a6 100644
--- a/SplitViewSidebar/FixedSidebarSplitViewController.m
+++ b/SplitViewSidebar/FixedSidebarSplitViewController.m
@@ -83,5 +83,14 @@ - (IBAction)collapseSidebar:(id)sender {
  
  */
 
+// There's a bug in the superclass; it doesn't check the splitViewItems count and so it'll crash if autolayout happens before viewDidLoad. This could happen if your window has a toolbar.
+- (BOOL)splitView:(NSSplitView *)splitView
+shouldHideDividerAtIndex:(NSInteger)dividerIndex {
+    if ([self.splitViewItems count] == 0) {
+        return NO;
+    }
+    return [super splitView:splitView shouldHideDividerAtIndex:dividerIndex];
+}
+
 
 @end