thodg/got

diff --git a/lib/worktree.c b/lib/worktree.c
index 3874728..cf78841 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -3995,10 +3995,6 @@ got_worktree_rebase_abort(struct got_worktree *worktree,
 	if (err)
 		return err;
 
-	err = open_fileindex(&fileindex, &fileindex_path, worktree);
-	if (err)
-		goto done;
-
 	err = got_ref_open(&resolved, repo,
 	    got_ref_get_symref_target(new_base_branch), 0);
 	if (err)
@@ -4037,6 +4033,10 @@ got_worktree_rebase_abort(struct got_worktree *worktree,
 	if (err)
 		goto done;
 
+	err = open_fileindex(&fileindex, &fileindex_path, worktree);
+	if (err)
+		goto done;
+
 	TAILQ_FOREACH(pe, &revertible_paths, entry) {
 		err = revert_file(worktree, fileindex, pe->path,
 		    progress_cb, progress_arg, repo);