diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm
index bcc98f4768..53b3715874 100644
--- a/AsyncDisplayKit/Details/ASDataController.mm
+++ b/AsyncDisplayKit/Details/ASDataController.mm
@@ -900,7 +900,8 @@ - (NSUInteger)numberOfSections
 - (NSUInteger)numberOfRowsInSection:(NSUInteger)section
 {
   ASDisplayNodeAssertMainThread();
-  return [[self completedNodes][section] count];
+  NSArray *completedNodes = [self completedNodes];
+  return (section < completedNodes.count) ? [completedNodes[section] count] : 0;
 }
 
 - (ASCellNode *)nodeAtIndexPath:(NSIndexPath *)indexPath