diff --git a/WHATS_NEW b/WHATS_NEW
index 2c168d1a1..2e2ceb833 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.50 - 
 ================================
+  Return EINVALID_CMD_LINE not success when invalid VG name format is used.
   Remove unnecessary messages after vgcreate/vgsplit refactor (2.02.49).
   Add log_errno to set a specific errno and replace log_error in due course.
   Add lvm_errno and lvm_errmsg to liblvm to obtain failure information.
diff --git a/tools/toollib.c b/tools/toollib.c
index 6f1c1a829..b50ba8e62 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -482,6 +482,8 @@ int process_each_vg(struct cmd_context *cmd, int argc, char **argv,
 				if (!validate_name(vg_name + 1)) {
 					log_error("Skipping invalid tag %s",
 						  vg_name);
+					if (ret_max < EINVALID_CMD_LINE)
+						ret_max = EINVALID_CMD_LINE;
 					continue;
 				}
 				if (!str_list_add(cmd->mem, &tags,
@@ -497,6 +499,8 @@ int process_each_vg(struct cmd_context *cmd, int argc, char **argv,
 			if (strchr(vg_name, '/')) {
 				log_error("Invalid volume group name: %s",
 					  vg_name);
+				if (ret_max < EINVALID_CMD_LINE)
+					ret_max = EINVALID_CMD_LINE;
 				continue;
 			}
 			if (!str_list_add(cmd->mem, &arg_vgnames,