diff --git a/scripts/apply.sh b/scripts/apply.sh
index fa6f4065..00631d2f 100755
--- a/scripts/apply.sh
+++ b/scripts/apply.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 # get base dir regardless of execution location
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
diff --git a/scripts/baseremap.sh b/scripts/baseremap.sh
index 26c6509d..ac38f35f 100755
--- a/scripts/baseremap.sh
+++ b/scripts/baseremap.sh
@@ -23,7 +23,7 @@ jarpath="$workdir/$minecraftversion/$minecraftversion"
 echo "Downloading unmapped vanilla jar..."
 if [ ! -f  "$jarpath.jar" ]; then
     mkdir -p "$workdir/$minecraftversion"
-    curl -s -o "$jarpath.jar" "https://s3.amazonaws.com/Minecraft.Download/versions/$minecraftversion/minecraft_server.$minecraftversion.jar"
+    curl -s -o "$jarpath.jar" "https://launcher.mojang.com/v1/objects/5fafba3f58c40dc51b5c3ca72a98f62dfdae1db7/server.jar"
     if [ "$?" != "0" ]; then
         echo "Failed to download the vanilla server jar. Check connectivity or try again later."
         exit 1
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index bdf67112..aaf65b08 100755
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 # get base dir regardless of execution location
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
diff --git a/sportpaper b/sportpaper
index 0b2cde68..541151be 100755
--- a/sportpaper
+++ b/sportpaper
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 # get base dir regardless of execution location
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink