diff --git a/bashrc.sh b/bashrc.sh
index e1dba7b..1bced93 100644
--- a/bashrc.sh
+++ b/bashrc.sh
@@ -404,7 +404,7 @@ function pull_prod_backup {
 	if [[ "$?" == "0" ]]; then
 		echo "Succeeded!"
 		mv -v "tmp/*${backup_type}*.zip" ./
-		rmdir tmp
+		rmdir -v tmp
 	else
 		mv tmp "$TRASH/tmp_`now`"
 	fi
@@ -415,7 +415,13 @@ function pull_prod_backups {
 	cd "$dir"
 	pull_prod_backup "$BACKUP"
 	pull_prod_backup "$SYSTEM"
+	du -h *.zip
+	status="$?"
 	cd ..
+	if [[ "$status" != 0 ]]; then
+		echo "Failed to find zip files, removing folder."
+		rmdir -v "$dir"
+	fi
 }
 alias pull-prod-backups="pull_prod_backups"
 alias pull-backups="pull_prod_backups"