diff --git a/pbc b/pbc
index 4620ac8..30be180 100755
--- a/pbc
+++ b/pbc
@@ -273,7 +273,7 @@ else
   ! which -s jq && echo "Error: jq executable not found!" >&2 && exit 200
 fi
 
-export PBS_REPOSITORY="$PBS_USER@${PBS_SERVER:-8007}:$PBS_DATASTORE"
+export PBS_REPOSITORY="$PBS_USER@$PBS_SERVER:$PBS_DATASTORE"
 export PBS_PASSWORD="$PBS_PASSWORD"
 
 case "$action" in
@@ -283,7 +283,8 @@ case "$action" in
   backup-cron)
     output=$(pbc-backup 2>&1)
     rc=$?
-    (( $rc != 0 )) && echo "$output"
+    (( rc != 0 )) && echo "$output" >&2
+    exit $rc
   ;;
   list)
     pbc-list "${args[@]}" || exit $?