diff --git a/packages/cli/bin/shepherd-deploy.sh b/packages/cli/bin/shepherd-deploy.sh
index cbe6687..28b8499 100755
--- a/packages/cli/bin/shepherd-deploy.sh
+++ b/packages/cli/bin/shepherd-deploy.sh
@@ -70,6 +70,7 @@ fi
 set +e
 shepherdjs "$@"
 SHEPHERD_EXIT_CODE=$?
+echo "shepherd exit code ${SHEPHERD_EXIT_CODE}"
 
 if [[ "$*" != *--dryrun*  &&  "${SHEPHERD_ENABLE_TTL_CLEANUP}" == "true"  ]]; then
   ${THISDIR}/delete-expired-resources.sh "$@"
diff --git a/packages/deployer/src/shepherd.ts b/packages/deployer/src/shepherd.ts
index b8a703e..7989f7f 100755
--- a/packages/deployer/src/shepherd.ts
+++ b/packages/deployer/src/shepherd.ts
@@ -329,5 +329,9 @@ function main() {
       process.exit(255)
     })
 }
-
-main()
+try {
+  main()
+} catch (mainErr) {
+  console.error("Main error", mainErr)
+  process.exit(255)
+}