diff --git a/cmd/system-cli/main.go b/cmd/system-cli/main.go
index 0b8205367..d16fd10b8 100644
--- a/cmd/system-cli/main.go
+++ b/cmd/system-cli/main.go
@@ -20,7 +20,9 @@ func main() {
 	ctx := context.AsContext(sigctx.New())
 
 	flags("system", system.Flags, auth.Flags)
+	if err := system.Init(ctx); err != nil {
+		log.Fatalf("Error initializing system: %+v", err)
+	}
 
-	system.Init(ctx)
-	cli.Init(ctx)
+	cli.Run(ctx)
 }
diff --git a/system/cli/cli.go b/system/cli/cli.go
index 659ce37a9..5a691a13f 100644
--- a/system/cli/cli.go
+++ b/system/cli/cli.go
@@ -11,7 +11,7 @@ import (
 	"github.com/crusttech/crust/system/internal/repository"
 )
 
-func Init(ctx context.Context) {
+func Run(ctx context.Context) {
 	var (
 		db              = repository.DB(ctx)
 		settingsService = settings.NewService(settings.NewRepository(db, "sys_settings"))