diff --git a/git.zig b/git.zig
index 8df61b60a52df64b034a5dc7711e25cf977477c0..cd130a48073f50da81f27769b928733304da90d9 100644
--- a/git.zig
+++ b/git.zig
@@ -1307,6 +1307,7 @@ fn traverseTo(r: *Repository, arena: std.mem.Allocator, treestart_id: TreeId, di
     while (iter.next()) |segment| {
         const tree = try r.getTreeA(arena, id.id);
         const o = tree.get(segment) orelse return null;
+        if (o.id != .tree) return null;
         id = o.id.tree;
     }
     return id;