diff --git a/cmd/machine.go b/cmd/machine.go
index 1c4acc1eea..d3a39200dd 100644
--- a/cmd/machine.go
+++ b/cmd/machine.go
@@ -160,8 +160,9 @@ func main() {
 	}()
 
 	// TODO: Close plugin servers in case of client panic.
-
-	app.Run(os.Args)
+	if err := app.Run(os.Args); err != nil {
+		log.Error(err)
+	}
 
 	close(commands.RpcClientDriversCh)
 	<-commands.RpcDriversClosedCh