diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 44c30232..4d2335d2 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -147,9 +147,20 @@ if [ ! -d "${CT_LOCAL_TARBALLS_DIR}" ]; then
 fi
 
 # Some more sanity checks now that we have all paths set up
-case "${CT_LOCAL_TARBALLS_DIR},${CT_TARBALLS_DIR},${CT_SRC_DIR},${CT_BUILD_DIR},${CT_PREFIX_DIR},${CT_INSTALL_DIR}" in
-    *" "*) CT_Abort "Don't use spaces in paths, it breaks things.";;
-esac
+for d in            \
+    LOCAL_TARBALLS  \
+    WORK            \
+    PREFIX          \
+    INSTALL         \
+    ; do
+        eval dir="\${CT_${d}_DIR}"
+        case "${dir}" in
+            *" "*)
+                CT_DoLog ERROR "'CT_${d}_DIR'='${dir}' contains a space in it."
+                CT_Abort "Don't use spaces in paths, it breaks things."
+                ;;
+        esac
+done
 
 # Check now if we can write to the destination directory:
 if [ -d "${CT_INSTALL_DIR}" ]; then