diff --git a/oi/OIDebugger.cpp b/oi/OIDebugger.cpp
index 8edc609..07faec6 100644
--- a/oi/OIDebugger.cpp
+++ b/oi/OIDebugger.cpp
@@ -2869,6 +2869,9 @@ bool OIDebugger::processTargetData() {
       if (!dumpDataSegment(req, outVec)) {
         LOG(ERROR) << "Failed to dump data-segment for " << req.arg;
       }
+
+      // Skip running Tree Builder
+      continue;
     }
 
     auto typeInfo = typeInfos.find(req);
@@ -2910,6 +2913,11 @@ bool OIDebugger::processTargetData() {
     }
   }
 
+  if (treeBuilderConfig.dumpDataSegment) {
+    // Tree Builder was not run
+    return true;
+  }
+
   if (typeTree.emptyOutput()) {
     LOG(FATAL)
         << "Nothing to output: failed to run TreeBuilder on any argument";