diff --git a/ocis/pkg/command/app-registry.go b/ocis/pkg/command/app-registry.go
index cdef223eb..036b7c4c8 100644
--- a/ocis/pkg/command/app-registry.go
+++ b/ocis/pkg/command/app-registry.go
@@ -19,7 +19,6 @@ func AppRegistryCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.AppRegistry.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/appprovider.go b/ocis/pkg/command/appprovider.go
index c4aa60a94..15d4048da 100644
--- a/ocis/pkg/command/appprovider.go
+++ b/ocis/pkg/command/appprovider.go
@@ -19,7 +19,6 @@ func AppProviderCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.AppProvider.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/audit.go b/ocis/pkg/command/audit.go
index 2f8618096..4a4521a51 100644
--- a/ocis/pkg/command/audit.go
+++ b/ocis/pkg/command/audit.go
@@ -19,7 +19,6 @@ func AuditCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Audit.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/auth-basic.go b/ocis/pkg/command/auth-basic.go
index de542f446..eee8da376 100644
--- a/ocis/pkg/command/auth-basic.go
+++ b/ocis/pkg/command/auth-basic.go
@@ -19,7 +19,6 @@ func AuthBasicCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.AuthBasic.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/auth-bearer.go b/ocis/pkg/command/auth-bearer.go
index 83d967334..84dec29bb 100644
--- a/ocis/pkg/command/auth-bearer.go
+++ b/ocis/pkg/command/auth-bearer.go
@@ -19,7 +19,6 @@ func AuthBearerCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.AuthBearer.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/auth-machine.go b/ocis/pkg/command/auth-machine.go
index 733b6a0d0..1d35b6d4f 100644
--- a/ocis/pkg/command/auth-machine.go
+++ b/ocis/pkg/command/auth-machine.go
@@ -19,7 +19,6 @@ func AuthMachineCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.AuthMachine.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/frontend.go b/ocis/pkg/command/frontend.go
index e0aa238fc..16782899d 100644
--- a/ocis/pkg/command/frontend.go
+++ b/ocis/pkg/command/frontend.go
@@ -19,7 +19,6 @@ func FrontendCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Frontend.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/gateway.go b/ocis/pkg/command/gateway.go
index 068c89204..2344976f6 100644
--- a/ocis/pkg/command/gateway.go
+++ b/ocis/pkg/command/gateway.go
@@ -19,7 +19,6 @@ func GatewayCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Gateway.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/graph.go b/ocis/pkg/command/graph.go
index 36c529ee4..41447fec0 100644
--- a/ocis/pkg/command/graph.go
+++ b/ocis/pkg/command/graph.go
@@ -19,7 +19,6 @@ func GraphCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Graph.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/graphexplorer.go b/ocis/pkg/command/graphexplorer.go
index fcbb0fe0f..cfc5ecb6c 100644
--- a/ocis/pkg/command/graphexplorer.go
+++ b/ocis/pkg/command/graphexplorer.go
@@ -19,7 +19,6 @@ func GraphExplorerCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.GraphExplorer.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/groups.go b/ocis/pkg/command/groups.go
index 37ddaaeaf..3e2627d1d 100644
--- a/ocis/pkg/command/groups.go
+++ b/ocis/pkg/command/groups.go
@@ -19,7 +19,6 @@ func GroupsCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Groups.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/idm.go b/ocis/pkg/command/idm.go
index d711dd6c5..cea462af1 100644
--- a/ocis/pkg/command/idm.go
+++ b/ocis/pkg/command/idm.go
@@ -19,7 +19,6 @@ func IDMCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.IDM.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go
index 0a2533308..88720c61c 100644
--- a/ocis/pkg/command/idp.go
+++ b/ocis/pkg/command/idp.go
@@ -19,7 +19,6 @@ func IDPCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.IDP.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/natsserver.go b/ocis/pkg/command/natsserver.go
index b02117206..40bf8651c 100644
--- a/ocis/pkg/command/natsserver.go
+++ b/ocis/pkg/command/natsserver.go
@@ -19,7 +19,6 @@ func NatsCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Nats.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/notifications.go b/ocis/pkg/command/notifications.go
index 0a004ef20..7a019f77c 100644
--- a/ocis/pkg/command/notifications.go
+++ b/ocis/pkg/command/notifications.go
@@ -19,7 +19,6 @@ func NotificationsCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Notifications.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/ocdav.go b/ocis/pkg/command/ocdav.go
index 4e60e0bd1..4c009ecce 100644
--- a/ocis/pkg/command/ocdav.go
+++ b/ocis/pkg/command/ocdav.go
@@ -19,7 +19,6 @@ func OCDavCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.OCDav.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go
index 90c3f446a..91877f8e6 100644
--- a/ocis/pkg/command/ocs.go
+++ b/ocis/pkg/command/ocs.go
@@ -19,7 +19,6 @@ func OCSCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.OCS.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go
index d25e06ec5..ab9dca8ae 100644
--- a/ocis/pkg/command/proxy.go
+++ b/ocis/pkg/command/proxy.go
@@ -19,7 +19,6 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Proxy.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go
index e107c206e..7a42d3588 100644
--- a/ocis/pkg/command/settings.go
+++ b/ocis/pkg/command/settings.go
@@ -19,7 +19,6 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Settings.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/sharing.go b/ocis/pkg/command/sharing.go
index dc2ffb101..4bbda8f16 100644
--- a/ocis/pkg/command/sharing.go
+++ b/ocis/pkg/command/sharing.go
@@ -19,7 +19,6 @@ func SharingCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Sharing.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/storage-metadata.go b/ocis/pkg/command/storage-metadata.go
index f829d3f37..002a98b4b 100644
--- a/ocis/pkg/command/storage-metadata.go
+++ b/ocis/pkg/command/storage-metadata.go
@@ -19,7 +19,6 @@ func StorageSystemCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.StorageSystem.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/storage-publiclink.go b/ocis/pkg/command/storage-publiclink.go
index 5f03f64ef..12feaf072 100644
--- a/ocis/pkg/command/storage-publiclink.go
+++ b/ocis/pkg/command/storage-publiclink.go
@@ -19,7 +19,6 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.StoragePublicLink.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/storage-shares.go b/ocis/pkg/command/storage-shares.go
index ee993955b..beec4cf33 100644
--- a/ocis/pkg/command/storage-shares.go
+++ b/ocis/pkg/command/storage-shares.go
@@ -19,7 +19,6 @@ func StorageSharesCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.StorageShares.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/storage-users.go b/ocis/pkg/command/storage-users.go
index 9da811b50..f7092994e 100644
--- a/ocis/pkg/command/storage-users.go
+++ b/ocis/pkg/command/storage-users.go
@@ -19,7 +19,6 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.StorageUsers.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go
index 55fd40a76..8571cfdf0 100644
--- a/ocis/pkg/command/store.go
+++ b/ocis/pkg/command/store.go
@@ -20,7 +20,6 @@ func StoreCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Store.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go
index 12fa79b33..4c6cf6db3 100644
--- a/ocis/pkg/command/thumbnails.go
+++ b/ocis/pkg/command/thumbnails.go
@@ -19,7 +19,6 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Thumbnails.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/users.go b/ocis/pkg/command/users.go
index 3c8b15ee5..68538952e 100644
--- a/ocis/pkg/command/users.go
+++ b/ocis/pkg/command/users.go
@@ -19,7 +19,6 @@ func UsersCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Users.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go
index a9acaf06d..e4cf353d4 100644
--- a/ocis/pkg/command/web.go
+++ b/ocis/pkg/command/web.go
@@ -19,7 +19,6 @@ func WebCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.Web.Commons = cfg.Commons
 			return nil
diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go
index 157d85b99..544474c42 100644
--- a/ocis/pkg/command/webdav.go
+++ b/ocis/pkg/command/webdav.go
@@ -20,7 +20,6 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
-				return err
 			}
 			cfg.WebDAV.Commons = cfg.Commons
 			return nil