diff --git a/cmd/XDC/consolecmd.go b/cmd/XDC/consolecmd.go
index a5fad4b367..f6b0630293 100644
--- a/cmd/XDC/consolecmd.go
+++ b/cmd/XDC/consolecmd.go
@@ -111,7 +111,10 @@ func localConsole(ctx *cli.Context) error {
 // remoteConsole will connect to a remote XDC instance, attaching a JavaScript
 // console to it.
 func remoteConsole(ctx *cli.Context) error {
-	// Attach to a remotely running XDC instance and start the JavaScript console
+	if ctx.Args().Len() > 1 {
+		utils.Fatalf("invalid command-line: too many arguments")
+	}
+
 	endpoint := ctx.Args().First()
 	if endpoint == "" {
 		path := node.DefaultDataDir()
diff --git a/internal/flags/helpers.go b/internal/flags/helpers.go
index e121aa544c..4642b82c45 100644
--- a/internal/flags/helpers.go
+++ b/internal/flags/helpers.go
@@ -70,6 +70,10 @@ func MigrateGlobalFlags(ctx *cli.Context) {
 
 	// This iterates over all commands and wraps their action function.
 	iterate(ctx.App.Commands, func(cmd *cli.Command) {
+		if cmd.Action == nil {
+			return
+		}
+
 		action := cmd.Action
 		cmd.Action = func(ctx *cli.Context) error {
 			doMigrateFlags(ctx)