diff --git a/tools/firmware-utils/src/buffalo-tag.c b/tools/firmware-utils/src/buffalo-tag.c
index e3f762583e..bb763420e5 100644
--- a/tools/firmware-utils/src/buffalo-tag.c
+++ b/tools/firmware-utils/src/buffalo-tag.c
@@ -97,7 +97,9 @@ static int check_params(void)
 	CHECKSTR(major, "major version", TAG_VERSION_LEN);
 	CHECKSTR(minor, "minor version", TAG_VERSION_LEN);
 	CHECKSTR(language, "language", TAG_LANGUAGE_LEN);
-	CHECKSTR(hwver, "hardware version", 2);
+
+	if (hwver)
+		CHECKSTR(hwver, "hardware version", 2);
 
 	if (num_regions == 0) {
 		ERR("no region code specified");