diff --git a/git-portfolio b/git-portfolio
index 4a8411a..030df37 100755
--- a/git-portfolio
+++ b/git-portfolio
@@ -16,10 +16,13 @@ function safely_remove_tmp_repos() {
 			echo "Warning: No git repositories found in '$repos'. Not deleting to prevent data loss."
 			rmdir "$repos" 2>/dev/null
 			return
+		else
+			rm -rf "$repos"
 		fi
-		rm -rf "$repos"
 	fi
-	rm -r "$tmp_portfolio"
+	if [ "$tmp_portfolio" ] && [ -d "$tmp_portfolio" ]; then
+		rm -r "$tmp_portfolio"
+	fi
 }
 function cleanup() {
 	safely_remove_tmp_repos