@@ -0,0 +1,16 @@
+using System;
+
+namespace LibGit2Sharp.Core.Handles;
+
+internal unsafe class UnownedTreeEntryHandle : TreeEntryHandle
+{
+    internal UnownedTreeEntryHandle()
+        : base(IntPtr.Zero, false)
+    {
+    }
+
+    internal UnownedTreeEntryHandle(IntPtr ptr)
+        : base(ptr, false)
+    {
+    }
+}
@@ -1998,7 +1998,7 @@ internal static extern int git_transport_unregister(
         internal static extern unsafe uint git_tree_entry_filemode(TreeEntryHandle entry);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe TreeEntryHandle git_tree_entry_byindex(ObjectHandle tree, UIntPtr idx);
+        internal static extern unsafe UnownedTreeEntryHandle git_tree_entry_byindex(ObjectHandle tree, UIntPtr idx);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe int git_tree_entry_bypath(
 
@@ -3188,13 +3188,7 @@ public static unsafe Mode git_tree_entry_attributes(TreeEntryHandle entry)
 
         public static unsafe TreeEntryHandle git_tree_entry_byindex(ObjectHandle tree, long idx)
         {
-            var handle = NativeMethods.git_tree_entry_byindex(tree, (UIntPtr)idx);
-            if (handle == null)
-            {
-                return null;
-            }
-
-            return new TreeEntryHandle(handle, false);
+            return NativeMethods.git_tree_entry_byindex(tree, (UIntPtr)idx);
         }
 
         public static unsafe TreeEntryHandle git_tree_entry_bypath(RepositoryHandle repo, ObjectId id, string treeentry_path)
Original file line number	Diff line number	Diff line change
`@@ -3188,13 +3188,7 @@ public static unsafe Mode git_tree_entry_attributes(TreeEntryHandle entry)`
`3188`	`3188`
`3189`	`3189`	`public static unsafe TreeEntryHandle git_tree_entry_byindex(ObjectHandle tree, long idx)`
`3190`	`3190`	`{`
`3191`		`- var handle = NativeMethods.git_tree_entry_byindex(tree, (UIntPtr)idx);`
`3192`		`- if (handle == null)`
`3193`		`- {`
`3194`		`- return null;`
`3195`		`- }`
`3196`		`-`
`3197`		`- return new TreeEntryHandle(handle, false);`
	`3191`	`+ return NativeMethods.git_tree_entry_byindex(tree, (UIntPtr)idx);`
`3198`	`3192`	`}`
`3199`	`3193`
`3200`	`3194`	`public static unsafe TreeEntryHandle git_tree_entry_bypath(RepositoryHandle repo, ObjectId id, string treeentry_path)`