diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 5142a7a7d8..1e38e4ea8b 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -966,6 +966,11 @@ static int cbfs_stage_make_elf(struct buffer *buff, uint32_t arch)
 	size_t empty_sz;
 	int rmod_ret;
 
+	if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
+		ERROR("You need to specify -m ARCH.\n");
+		return -1;
+	}
+
 	if (cbfs_stage_decompress(&stage, buff)) {
 		ERROR("Failed to decompress stage.\n");
 		return -1;
@@ -1047,6 +1052,11 @@ static int cbfs_payload_make_elf(struct buffer *buff, uint32_t arch)
 	size_t empty_sz;
 	int segments = 0;
 
+	if (arch == CBFS_ARCHITECTURE_UNKNOWN) {
+		ERROR("You need to specify -m ARCH.\n");
+		return -1;
+	}
+
 	/* Count the number of segments inside buffer */
 	while (true) {
 		uint32_t payload_type = 0;