diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index f90ec38..1c1b337 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -52,6 +52,7 @@ func executor(cmd string) {
 		debuglevels := map[zerolog.Level]string{zerolog.InfoLevel: "info", zerolog.DebugLevel: "debug", zerolog.TraceLevel: "trace"}
 		if len(args) < 2 {
 			println("current debug level: " + debuglevels[log.GetLevel()])
+			return
 		}
 		if newlevel, ok := levelsdebug[args[1]]; ok {
 			zerolog.SetGlobalLevel(newlevel)
diff --git a/internal/cli/set.go b/internal/cli/set.go
index d496420..604e642 100644
--- a/internal/cli/set.go
+++ b/internal/cli/set.go
@@ -207,6 +207,9 @@ func cmdSet(bridge *ziggy.Bridge, args []string) error {
 				return errors.New("not enough arguments")
 			}
 			argHead++
+			if argHead > len(args)-1 {
+				return errors.New("not enough arguments")
+			}
 			targetScene := args[argHead]
 			actions = append(actions, func() error {
 				err := target.Scene(targetScene)