diff --git a/scan-tree.c b/scan-tree.c
index a0e09ce..eda8c67 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -159,25 +159,24 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
-	DIR *dir;
+	DIR *dir = opendir(path);
 	struct dirent *ent;
 	char *buf;
 	struct stat st;
 
-	if (is_git_dir(path)) {
-		add_repo(base, path, fn);
-		return;
-	}
-	if (is_git_dir(fmt("%s/.git", path))) {
-		add_repo(base, fmt("%s/.git", path), fn);
-		return;
-	}
-	dir = opendir(path);
 	if (!dir) {
 		fprintf(stderr, "Error opening directory %s: %s (%d)\n",
 			path, strerror(errno), errno);
 		return;
 	}
+	if (is_git_dir(path)) {
+		add_repo(base, path, fn);
+		goto end;
+	}
+	if (is_git_dir(fmt("%s/.git", path))) {
+		add_repo(base, fmt("%s/.git", path), fn);
+		goto end;
+	}
 	while((ent = readdir(dir)) != NULL) {
 		if (ent->d_name[0] == '.') {
 			if (ent->d_name[1] == '\0')
@@ -202,6 +201,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
 			scan_path(base, buf, fn);
 		free(buf);
 	}
+end:
 	closedir(dir);
 }