diff --git a/centos/resources/environment.sh b/centos/resources/environment.sh
index 637c97b..2a69925 100755
--- a/centos/resources/environment.sh
+++ b/centos/resources/environment.sh
@@ -4,65 +4,78 @@
 os_name=$(uname -s)
 os_version=$(uname -r)
 os_mode='unknown'
-os_test=$(uname -m)
+
+#cpu details
+cpu_name=$(uname -m)
 cpu_architecture='unknown'
+cpu_mode='unknown'
 
 #check what the CPU and OS are
-	cpu_name='unknown'
-	cpu_mode='unknown'
-	if [ .$cpu_name = .'armv7l' ]; then
-		os_mode='32'
-		cpu_mode='32'
-		# RaspberryPi 3 is actually armv8l but current Raspbian reports the cpu as armv7l and no Raspbian 64Bit has been released at this time
-		cpu_architecture='arm'
-	elif [ .$cpu_name = .'armv8l' ]; then
-		# We currently have no test case for armv8l
-		os_mode='unknown'
-		cpu_name='64'
-		cpu_architecture='arm'
-	elif [ .$cpu_name = .'i386' ]; then
-		os_mode='32'
-		if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
-			cpu_mode='64'
-		else
-			cpu_mode='32'
-		fi
-		cpu_architecture='x86'
-	elif [ .$cpu_name = .'i686' ]; then
-		os_mode='32'
-		if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
-			cpu_mode='64'
-		else
-			cpu_mode='32'
-		fi
-		cpu_architecture='x86'
-	elif [ .$cpu_name = .'x86_64' ]; then
-		os_mode='64'
-		if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
-			os_mode='64'
-		else
-			os_mode='32'
-		fi
-		cpu_architecture='x86'
-	fi
-	
-	if [ .$cpu_architecture = .'arm' ]; then
-		error "CentOS on arm is not supported at this time"
-		exit 3
-	elif [ .$cpu_architecture = .'x86' ]; then
-		if [ .$os_mode = .'32' ]; then
-			error "You are using a 32bit OS this is unsupported"
-			if [ .$cpu_mode = .'64' ]; then
-				warning " Your CPU is 64bit you should consider reinstalling with a 64bit OS"
-			fi
-			exit 3
-		elif [ .$os_mode = .'64' ]; then
-			verbose "Correct CPU/OS detected"
-		else
-			error "Unknown os_mode $os_mode this is unsupported"
-			exit 3
-		fi
+if [ .$cpu_name = .'armv7l' ]; then
+	# RaspberryPi 3 is actually armv8l but current Raspbian reports the cpu as armv7l and no Raspbian 64Bit has been released at this time
+	os_mode='32'
+	cpu_mode='32'
+	cpu_architecture='arm'
+elif [ .$cpu_name = .'armv8l' ]; then
+	# We currently have no test case for armv8l
+	os_mode='unknown'
+	cpu_mode='64'
+	cpu_architecture='arm'
+elif [ .$cpu_name = .'i386' ]; then
+	os_mode='32'
+	if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
+		cpu_mode='64'
 	else
-		error "You are using a unsupported architecture $cpu_architecture"
+		cpu_mode='32'
 	fi
+	cpu_architecture='x86'
+elif [ .$cpu_name = .'i686' ]; then
+	os_mode='32'
+	if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
+		cpu_mode='64'
+	else
+		cpu_mode='32'
+	fi
+	cpu_architecture='x86'
+elif [ .$cpu_name = .'x86_64' ]; then
+	os_mode='64'
+	if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then
+		os_mode='64'
+	else
+		os_mode='32'
+	fi
+	cpu_architecture='x86'
+else
+	error "You are using an unsupported cpu '$cpu_name'"
+	exit 3
+fi
+	
+if [ .$cpu_architecture = .'arm' ]; then
+	error "CentOS on arm is not supported at this time"
+	exit 3
+elif [ .$cpu_architecture = .'x86' ]; then
+	if [ .$os_mode = .'32' ]; then
+		error "You are using a 32bit OS this is unsupported"
+		if [ .$cpu_mode = .'64' ]; then
+			warning " Your CPU is 64bit you should consider reinstalling with a 64bit OS"
+		fi
+		exit 3
+	elif [ .$os_mode = .'64' ]; then
+		verbose "Correct CPU and Operating System detected"
+	else
+		error "Unknown Operating System mode '$os_mode' is unsupported"
+		warning "Detected environment was :-"
+		warning "os_name:'$os_name'"
+		warning "os_mode:'$os_mode'"
+		warning "cpu_name:'$cpu_name'"
+		warning "cpu_architecture:'$cpu_architecture'"
+		exit 3
+	fi
+else
+	error "You are using an unsupported architecture '$cpu_architecture'"
+	warning "Detected environment was :-"
+	warning "os_name:'$os_name'"
+	warning "os_mode:'$os_mode'"
+	warning "cpu_name:'$cpu_name'"
+	exit 3
 fi
diff --git a/debian/resources/environment.sh b/debian/resources/environment.sh
index 5ec856b..7bce9a9 100755
--- a/debian/resources/environment.sh
+++ b/debian/resources/environment.sh
@@ -10,6 +10,7 @@ cpu_name=$(uname -m)
 cpu_architecture='unknown'
 cpu_mode='unknown'
 
+#check what the CPU and OS are
 if [ .$cpu_name = .'armv7l' ]; then
 	# RaspberryPi 3 is actually armv8l but current Raspbian reports the cpu as armv7l and no Raspbian 64Bit has been released at this time
 	os_mode='32'
@@ -44,6 +45,9 @@ elif [ .$cpu_name = .'x86_64' ]; then
 		cpu_mode='32'
 	fi
 	cpu_architecture='x86'
+else
+	error "You are using an unsupported cpu '$cpu_name'"
+	exit 3
 fi
 
 if [ .$cpu_architecture = .'arm' ]; then
@@ -69,11 +73,16 @@ elif [ .$cpu_architecture = .'x86' ]; then
 	elif [ .$os_mode = .'64' ]; then
 		verbose "Correct CPU and Operating System detected"
 	else
-		error "Unknown Operating System mode $os_mode is unsupported"
+		error "Unknown Operating System mode '$os_mode' is unsupported"
 		switch_source=true
 		switch_package=false
 	fi
 else
-	error "You are using a unsupported architecture $cpu_architecture"
+	error "You are using an unsupported architecture '$cpu_architecture'"
+	warning "Detected environment was :-"
+	warning "os_name:'$os_name'"
+	warning "os_codename:'$os_codename'"
+	warning "os_mode:'$os_mode'"
+	warning "cpu_name:'$cpu_name'"
 	exit 3
 fi
diff --git a/devuan/resources/environment.sh b/devuan/resources/environment.sh
index 5ec856b..7bce9a9 100755
--- a/devuan/resources/environment.sh
+++ b/devuan/resources/environment.sh
@@ -10,6 +10,7 @@ cpu_name=$(uname -m)
 cpu_architecture='unknown'
 cpu_mode='unknown'
 
+#check what the CPU and OS are
 if [ .$cpu_name = .'armv7l' ]; then
 	# RaspberryPi 3 is actually armv8l but current Raspbian reports the cpu as armv7l and no Raspbian 64Bit has been released at this time
 	os_mode='32'
@@ -44,6 +45,9 @@ elif [ .$cpu_name = .'x86_64' ]; then
 		cpu_mode='32'
 	fi
 	cpu_architecture='x86'
+else
+	error "You are using an unsupported cpu '$cpu_name'"
+	exit 3
 fi
 
 if [ .$cpu_architecture = .'arm' ]; then
@@ -69,11 +73,16 @@ elif [ .$cpu_architecture = .'x86' ]; then
 	elif [ .$os_mode = .'64' ]; then
 		verbose "Correct CPU and Operating System detected"
 	else
-		error "Unknown Operating System mode $os_mode is unsupported"
+		error "Unknown Operating System mode '$os_mode' is unsupported"
 		switch_source=true
 		switch_package=false
 	fi
 else
-	error "You are using a unsupported architecture $cpu_architecture"
+	error "You are using an unsupported architecture '$cpu_architecture'"
+	warning "Detected environment was :-"
+	warning "os_name:'$os_name'"
+	warning "os_codename:'$os_codename'"
+	warning "os_mode:'$os_mode'"
+	warning "cpu_name:'$cpu_name'"
 	exit 3
 fi