diff --git a/status.go b/status.go
index c61aedb..4e1196c 100644
--- a/status.go
+++ b/status.go
@@ -87,6 +87,8 @@ func (statusList *StatusList) ByIndex(index int) (StatusEntry, error) {
 	}
 	ptr := C.git_status_byindex(statusList.ptr, C.size_t(index))
 	if ptr == nil {
+		runtime.LockOSThread()
+		defer runtime.UnlockOSThread()
 		return StatusEntry{}, MakeGitError(C.int(ErrNotFound))
 	}
 	entry := statusEntryFromC(ptr)