diff --git a/pkg/micro/grpc/grpc.go b/pkg/micro/grpc/grpc.go
index 9bff7f94b..9b01aaf01 100644
--- a/pkg/micro/grpc/grpc.go
+++ b/pkg/micro/grpc/grpc.go
@@ -19,7 +19,9 @@ func NewService(opts ...Option) grpc.Service {
 	)
 
 	hdlr := svc.New(options.Config)
-	proto.RegisterSettingsServiceHandler(service.Server(), hdlr)
+	if err := proto.RegisterSettingsServiceHandler(service.Server(), hdlr); err != nil {
+		options.Logger.Fatal().Err(err).Msg("could not register service handler")
+	}
 
 	service.Init()
 	return service
diff --git a/pkg/store/filesystem/store.go b/pkg/store/filesystem/store.go
index 14e6a2dfb..5b21972f3 100644
--- a/pkg/store/filesystem/store.go
+++ b/pkg/store/filesystem/store.go
@@ -18,9 +18,9 @@ import (
 
 var (
 	// StoreName is the default name for the accounts store
-	StoreName     string = "ocis-store"
-	managerName          = "filesystem"
-	emptyKeyError        = "key cannot be empty"
+	StoreName     = "ocis-store"
+	managerName   = "filesystem"
+	emptyKeyError = "key cannot be empty"
 )
 
 // StoreName is the default name for the store container