diff --git a/aptosaurus.sh b/aptosaurus.sh
index ddc15e4..fa22071 100755
--- a/aptosaurus.sh
+++ b/aptosaurus.sh
@@ -145,7 +145,7 @@ task_update() {
 
 task_metafiles() {
 	if [[ "$(basename "${PWD}")" != "$(basename "${dir_repo}")" ]]; then
-		cd "${dir_repo}" || { echo "Error: Failed to cd into repo"; exit 3; };
+		cd "${dir_repo}" || { echo "Error: Failed to cd into repo" >&2; exit 3; };
 	fi
 	task_begin "Building packages file";
 	apt-ftparchive packages . >Packages;
@@ -160,6 +160,7 @@ task_metafiles() {
 	execute gpg --yes -abs -u "${gpg_key_id}" -o Release.gpg Release
 	task_end $?;
 	
+	cd - || { echo "Error: Failed to cd back to previous directory" >&2; exit 4; };
 	tasks_run generate-summary;
 }