diff --git a/misc/build.func b/misc/build.func
index 971b5d5..d4e2f7f 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -414,10 +414,13 @@ advanced_settings() {
             var_os=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
                 "debian" "" $([ "$var_default_os" == "debian" ] && echo "ON" || echo "OFF") \
                 "ubuntu" "" $([ "$var_default_os" == "ubuntu" ] && echo "ON" || echo "OFF") \
-                3>&1 1>&2 2>&3) || exit_script
+                3>&1 1>&2 2>&3)
 
-            [ -n "$var_os" ] && echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            if [ $? -ne 0 ]; then
+                exit_script
+            fi
         done
+        echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
     fi
 
     if [ "$var_os" == "debian" ] || [ "$var_os" == "ubuntu" ]; then
@@ -428,19 +431,23 @@ advanced_settings() {
                 var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
                     "11" "Bullseye" $([ "$var_default_version" == "11" ] && echo "ON" || echo "OFF") \
                     "12" "Bookworm" $([ "$var_default_version" == "12" ] && echo "ON" || echo "OFF") \
-                    3>&1 1>&2 2>&3) || exit_script
+                    3>&1 1>&2 2>&3)
             elif [ "$var_os" == "ubuntu" ]; then
                 var_version=$(whiptail --backtitle "[dev] Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
                     "20.04" "Focal" $([ "$var_default_version" == "20.04" ] && echo "ON" || echo "OFF") \
                     "22.04" "Jammy" $([ "$var_default_version" == "22.04" ] && echo "ON" || echo "OFF") \
                     "24.04" "Noble" $([ "$var_default_version" == "24.04" ] && echo "ON" || echo "OFF") \
                     "24.10" "Oracular" $([ "$var_default_version" == "24.10" ] && echo "ON" || echo "OFF") \
-                    3>&1 1>&2 2>&3) || exit_script
+                    3>&1 1>&2 2>&3)
             fi
 
-            [ -n "$var_version" ] && echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+            if [ $? -ne 0 ]; then
+                exit_script
+            fi
         done
+        echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
     fi
+
     # Setting Default Tag for Advanced Settings
     TAGS="community-script-dev;${var_tags:-}"
     CT_DEFAULT_TYPE="${CT_TYPE}"