diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml
index dffd5b9..cef3e32 100644
--- a/tasks/general/acct_mgmt/users.yml
+++ b/tasks/general/acct_mgmt/users.yml
@@ -820,7 +820,7 @@
         if [[ "$?" == "0" ]]; then
           echo "Succeeded!"
           mv -v "tmp/*${backup_type}*.zip" ./
-          rmdir tmp
+          rmdir -v tmp
         else
           mv tmp ~/TRASH/"tmp_`now`"
         fi
@@ -831,7 +831,13 @@
         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"