diff --git a/docs/types-and-platforms/server-types/bukkit-spigot.md b/docs/types-and-platforms/server-types/bukkit-spigot.md
index 34bafc2f5a1..161589960e6 100644
--- a/docs/types-and-platforms/server-types/bukkit-spigot.md
+++ b/docs/types-and-platforms/server-types/bukkit-spigot.md
@@ -1,11 +1,5 @@
 # Bukkit/Spigot
 
-!!! warning
-
-    The download provider for Bukkit/Spigot, GetBukkit, is no longer operational. It is recommended that users switch to [Paper](paper.md) instead.
-
-    This image still provides an option to build Bukkit/Spigot from source if Paper is not feasible.
-
 Run a Bukkit/Spigot server type by setting the environment variable `TYPE` to "BUKKIT" or "SPIGOT".
 
 !!! example
diff --git a/scripts/start-deployBukkitSpigot b/scripts/start-deployBukkitSpigot
index b1772e9b68d..72c8a8a0539 100755
--- a/scripts/start-deployBukkitSpigot
+++ b/scripts/start-deployBukkitSpigot
@@ -89,7 +89,7 @@ function downloadSpigot {
   tempFile="$SERVER.$$"
 
   # HTTP error or download site responded with an HTML error page
-  if ! curl -fsSL -o "$tempFile" "${curlArgs[@]}" "$downloadUrl" || grep -iq "doctype html" "$tempFile"; then
+  if ! curl -fsSL -o "$tempFile" "${curlArgs[@]}" "$downloadUrl" || ( [ -f "$tempFile" ] && grep -iq "doctype html" "$tempFile" ); then
 
     cat <<EOF
 
@@ -113,7 +113,9 @@ EOF
     fi
 
   else
-    mv "$tempFile" "$SERVER"
+    if [ -f "$tempFile" ]; then
+      mv "$tempFile" "$SERVER"
+    fi
 
   fi