diff --git a/aptosaurus.sh b/aptosaurus.sh
index f535b64..e721476 100755
--- a/aptosaurus.sh
+++ b/aptosaurus.sh
@@ -74,6 +74,10 @@ task_setup() {
 	fi
 	task_end $?;
 	
+	task_begin "Creating directories";
+	mkdir "${dir_sources}" "${dir_repo}" "${GNUPGHOME}";
+	task_end $?;
+	
 	if [ ! -e "${GNUPGHOME}" ]; then
 		if [ ! -f "./secret.gpg" ]; then
 			echo "Couldn't find the secret key to use.";
@@ -87,10 +91,6 @@ task_setup() {
 		task_end $?;
 	fi
 	
-	task_begin "Creating directories";
-	mkdir "${dir_sources}" "${dir_repo}";
-	task_end $?;
-	
 	if [ ! -f "${repo_dir}/aptosaurus.asc" ]; then
 		task_begin "Hard linking public signing key";
 		cp -al "./public.gpg" "${dir_repo}/aptosaurus.asc";