diff --git a/src/install.sh b/src/install.sh
index 474a6be..e8513e4 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -581,6 +581,11 @@ detectImage() {
   info "Detected: $desc"
   setXML "" && return 0
 
+  if [[ "${id,,}" == "win8x86"* ]] || [[ "${id,,}" == "win81x86"* ]] \
+  || [[ "${id,,}" == "win10x86"* ]] || [[ "${id,,}" == "win11x86"* ]]; then
+    error "The 32-bit version of $desc is not supported!" && return 1
+  fi
+
   msg="the answer file for $desc was not found ($DETECTED.xml)"
   local fallback="/run/assets/${DETECTED%%-*}.xml"
 
@@ -706,10 +711,6 @@ addDriver() {
     warn "no Windows version specified for \"$driver\" driver!" && return 0
   fi
 
-  if [[ "${id,,}" == "win10x86"* ]]; then
-    error "The 32-bit version of Windows 10 is not supported!" && exit 84
-  fi
-
   case "${id,,}" in
     "win7x86"* ) folder="w7/x86" ;;
     "win7x64"* ) folder="w7/amd64" ;;