diff --git a/clihandler/cmd/control.go b/clihandler/cmd/control.go
index 827fd4f8..15c7f083 100644
--- a/clihandler/cmd/control.go
+++ b/clihandler/cmd/control.go
@@ -40,8 +40,10 @@ var controlCmd = &cobra.Command{
 		if len(args) > 0 {
 			controls := strings.Split(args[0], ",")
 			if len(controls) > 1 {
-				if controls[1] == "" {
-					return fmt.Errorf("usage: <control-0>,<control-1>")
+				for _, control := range controls {
+					if control == "" {
+						return fmt.Errorf("usage: <control-0>,<control-1>")
+					}
 				}
 			}
 		} else {
diff --git a/clihandler/cmd/framework.go b/clihandler/cmd/framework.go
index f06c9c80..4cd17c86 100644
--- a/clihandler/cmd/framework.go
+++ b/clihandler/cmd/framework.go
@@ -51,8 +51,10 @@ var frameworkCmd = &cobra.Command{
 		if len(args) > 0 {
 			frameworks := strings.Split(args[0], ",")
 			if len(frameworks) > 1 {
-				if frameworks[1] == "" {
-					return fmt.Errorf("usage: <framework-0>,<framework-1>")
+				for _, framework := range frameworks {
+					if framework == "" {
+						return fmt.Errorf("usage: <framework-0>,<framework-1>")
+					}
 				}
 			}
 		} else {