diff --git a/scripts/deploy-ebook-to-www b/scripts/deploy-ebook-to-www
index 46d8c91e..cdf63c3e 100755
--- a/scripts/deploy-ebook-to-www
+++ b/scripts/deploy-ebook-to-www
@@ -54,7 +54,10 @@ do
 		die "Invalid repo root: ${repoDir}"
 	fi
 
-	cd "${repoDir}" || return
+	if ! pushd "${repoDir}" > /dev/null; then
+		echo "Couldn't cd into ${repoDir}. Skipping."
+		continue
+	fi
 
 	if [ "${verbose}" = "true" ]; then
 		printf "Entering %s\n" "${repoDir}"
@@ -155,6 +158,8 @@ do
 	if [ "${verbose}" = "true" ]; then
 		printf "Done.\n"
 	fi
+
+	popd > /dev/null || die "Couldn't pop directory."
 done
 
 # Build the OPDS catalog