diff --git a/imagebuilder.sh b/imagebuilder.sh
index dd38c1d..716d3dd 100755
--- a/imagebuilder.sh
+++ b/imagebuilder.sh
@@ -158,13 +158,13 @@ case "${subcommand}" in
 				fi
 				task_end "$?";
 				
-				if [[ "${subcommand}" == "base-nopush" ]]; then
-					echo "Nopush mode invoked, not checking output directory or pushing to docker registry";
+				if [[ "${imagetype}" == "base-nopush" ]]; then
+					echo "${HC}Nopush mode invoked, not checking output directory or pushing to docker registry${RS}";
 					exit 0;
 				fi
 				
 				if [[ ! -d "${output_dir}" ]]; then
-					echo -e "Error: The builder script failed to create the output directory.";
+					echo -e "${FRED}${HC}Error: The builder script failed to create the output directory (expeting directory at ${FBLE}${output_dir}${FRED}, but found nothing).${RS}";
 					exit 6;
 				fi