diff --git a/Scripts/drone-static-upload.sh b/Scripts/drone-static-upload.sh
index a337c14d0..040cde913 100755
--- a/Scripts/drone-static-upload.sh
+++ b/Scripts/drone-static-upload.sh
@@ -56,9 +56,10 @@ else
 fi
 
 archive="$base.tar.xz"
-upload_to="oxen.rocks/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}"
 
 if [ "$should_upload" == "true" ]; then
+    upload_to="oxen.rocks/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}"
+
     # Copy over the build products
     mkdir -vp "$base"
     mkdir -p build
@@ -90,5 +91,5 @@ SFTP
 
     echo -e "\n\n\n\n\e[32;1mUploaded to https://${upload_to}/${archive}\e[0m\n\n\n"
 else
-    echo -e "https://${upload_to}/${archive}"
+    echo -e "https://oxen.rocks/${DRONE_REPO// /_}/${DRONE_SOURCE_BRANCH// /_}/${archive}"
 fi
\ No newline at end of file
diff --git a/Scripts/drone-upload-exists.sh b/Scripts/drone-upload-exists.sh
index d61c40099..2b1d286e0 100755
--- a/Scripts/drone-upload-exists.sh
+++ b/Scripts/drone-upload-exists.sh
@@ -39,5 +39,6 @@ while true; do
 
 	if [ $total_poll_duration -gt $max_poll_duration ]; then
 		echo -e "\n\n\n\n\e[31;1mCould not find existing build artifact after polling for 30 minutes\e[0m\n\n\n"
+		exit 1
 	fi
 done