diff --git a/quickget b/quickget
index 9fe1760..501e1ac 100755
--- a/quickget
+++ b/quickget
@@ -4064,6 +4064,17 @@ if [ "${CHECK_ALL_ARCH}" == "true" ] && [ -n "${2}" ]; then
     exit 0
 fi
 
+# Validate architecture support before attempting download
+if ! is_arch_supported "${OS}" "${ARCH}"; then
+    if [ "${OPERATION}" == "test" ] || [ "${OPERATION}" == "show" ]; then
+        test_result "${OS}" "${2:-}" "${3:-}" "" "SKIP" "(not available for ${ARCH})"
+        exit 0
+    else
+        echo "ERROR! $(pretty_name "${OS}") is not available for ${ARCH} architecture."
+        exit 1
+    fi
+fi
+
 if [ -n "${2}" ]; then
     RELEASE="${2}"
     VM_PATH="${OS}-${RELEASE}"