diff --git a/ocis-pkg/handlers/checknats.go b/ocis-pkg/handlers/checknats.go
index a8144cb4b9..7eba98e906 100644
--- a/ocis-pkg/handlers/checknats.go
+++ b/ocis-pkg/handlers/checknats.go
@@ -9,7 +9,7 @@ import (
 
 // NewNatsCheck checks the reachability of a nats server.
 func NewNatsCheck(natsCluster string, options ...nats.Option) func(context.Context) error {
-	return func(ctx context.Context) error {
+	return func(_ context.Context) error {
 		n, err := nats.Connect(natsCluster, options...)
 		if err != nil {
 			return fmt.Errorf("could not connect to nats server: %v", err)
diff --git a/ocis-pkg/handlers/checktcp.go b/ocis-pkg/handlers/checktcp.go
index 90308988cb..a09e6570cd 100644
--- a/ocis-pkg/handlers/checktcp.go
+++ b/ocis-pkg/handlers/checktcp.go
@@ -7,7 +7,7 @@ import (
 
 // NewTCPCheck returns a check that connects to a given tcp endpoint.
 func NewTCPCheck(address string) func(ctx context.Context) error {
-	return func(ctx context.Context) error {
+	return func(_ context.Context) error {
 		conn, err := net.Dial("tcp", address)
 		if err != nil {
 			return err
@@ -17,7 +17,7 @@ func NewTCPCheck(address string) func(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		
+
 		return nil
 	}
 }
diff --git a/services/idp/pkg/command/server.go b/services/idp/pkg/command/server.go
index 7f02e1bb2c..9c12ac619f 100644
--- a/services/idp/pkg/command/server.go
+++ b/services/idp/pkg/command/server.go
@@ -36,7 +36,10 @@ func Server(cfg *config.Config) *cli.Command {
 		Usage:    fmt.Sprintf("start the %s service without runtime (unsupervised mode)", cfg.Service.Name),
 		Category: "server",
 		Before: func(c *cli.Context) error {
-			configlog.ReturnFatal(parser.ParseConfig(cfg))
+			err := configlog.ReturnFatal(parser.ParseConfig(cfg))
+			if err != nil {
+				return err
+			}
 
 			if cfg.IDP.EncryptionSecretFile != "" {
 				if err := ensureEncryptionSecretExists(cfg.IDP.EncryptionSecretFile); err != nil {