diff --git a/components/usermgmt/pkg/server/group.go b/components/usermgmt/pkg/server/group.go
index 4d3056a..456ed23 100644
--- a/components/usermgmt/pkg/server/group.go
+++ b/components/usermgmt/pkg/server/group.go
@@ -20,7 +20,7 @@ func NewGroupServer(ps service.GroupService) rpcv3.GroupServer {
 func (s *groupServer) CreateGroup(ctx context.Context, p *userpbv3.Group) (*userpbv3.Group, error) {
 	group, err := s.Create(ctx, p)
 	if err != nil {
-		return nil, err
+		return group, err
 	}
 	return group, nil
 }
@@ -28,7 +28,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, p *userpbv3.Group) (*user
 func (s *groupServer) GetGroups(ctx context.Context, p *userpbv3.Group) (*userpbv3.GroupList, error) {
 	groups, err := s.List(ctx, p)
 	if err != nil {
-		return nil, err
+		return groups, err
 	}
 	return groups, nil
 }
@@ -38,7 +38,7 @@ func (s *groupServer) GetGroup(ctx context.Context, p *userpbv3.Group) (*userpbv
 	if err != nil {
 		group, err = s.GetByID(ctx, p.Metadata.Id)
 		if err != nil {
-			return nil, err
+			return group, err
 		}
 	}
 
@@ -56,7 +56,7 @@ func (s *groupServer) DeleteGroup(ctx context.Context, p *userpbv3.Group) (*user
 func (s *groupServer) UpdateGroup(ctx context.Context, p *userpbv3.Group) (*userpbv3.Group, error) {
 	group, err := s.Update(ctx, p)
 	if err != nil {
-		return nil, err
+		return group, err
 	}
 	return group, nil
 }
diff --git a/components/usermgmt/pkg/server/role.go b/components/usermgmt/pkg/server/role.go
index dac0ce8..fe19903 100644
--- a/components/usermgmt/pkg/server/role.go
+++ b/components/usermgmt/pkg/server/role.go
@@ -20,7 +20,7 @@ func NewRoleServer(ps service.RoleService) rpcv3.RoleServer {
 func (s *roleServer) CreateRole(ctx context.Context, p *userpbv3.Role) (*userpbv3.Role, error) {
 	role, err := s.Create(ctx, p)
 	if err != nil {
-		return nil, err
+		return role, err
 	}
 	return role, nil
 }
@@ -28,7 +28,7 @@ func (s *roleServer) CreateRole(ctx context.Context, p *userpbv3.Role) (*userpbv
 func (s *roleServer) GetRoles(ctx context.Context, p *userpbv3.Role) (*userpbv3.RoleList, error) {
 	roles, err := s.List(ctx, p)
 	if err != nil {
-		return nil, err
+		return roles, err
 	}
 	return roles, nil
 }
@@ -38,7 +38,7 @@ func (s *roleServer) GetRole(ctx context.Context, p *userpbv3.Role) (*userpbv3.R
 	if err != nil {
 		role, err = s.GetByID(ctx, p.Metadata.Id)
 		if err != nil {
-			return nil, err
+			return role, err
 		}
 	}
 
@@ -56,7 +56,7 @@ func (s *roleServer) DeleteRole(ctx context.Context, p *userpbv3.Role) (*userpbv
 func (s *roleServer) UpdateRole(ctx context.Context, p *userpbv3.Role) (*userpbv3.Role, error) {
 	role, err := s.Update(ctx, p)
 	if err != nil {
-		return nil, err
+		return role, err
 	}
 	return role, nil
 }
diff --git a/components/usermgmt/pkg/server/user.go b/components/usermgmt/pkg/server/user.go
index 4b1087f..c279870 100644
--- a/components/usermgmt/pkg/server/user.go
+++ b/components/usermgmt/pkg/server/user.go
@@ -20,7 +20,7 @@ func NewUserServer(ps service.UserService) rpcv3.UserServer {
 func (s *userServer) CreateUser(ctx context.Context, p *userpbv3.User) (*userpbv3.User, error) {
 	user, err := s.Create(ctx, p)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	return user, nil
 }
@@ -28,7 +28,7 @@ func (s *userServer) CreateUser(ctx context.Context, p *userpbv3.User) (*userpbv
 func (s *userServer) GetUsers(ctx context.Context, p *userpbv3.User) (*userpbv3.UserList, error) {
 	users, err := s.List(ctx, p)
 	if err != nil {
-		return nil, err
+		return users, err
 	}
 	return users, nil
 }
@@ -38,7 +38,7 @@ func (s *userServer) GetUser(ctx context.Context, p *userpbv3.User) (*userpbv3.U
 	// if err != nil {
 	user, err := s.GetByID(ctx, p.Metadata.Id)
 	if err != nil {
-		return nil, err
+		return user, err
 	}
 	// }
 
diff --git a/components/usermgmt/pkg/service/role.go b/components/usermgmt/pkg/service/role.go
index 2bd17df..3b0a72f 100644
--- a/components/usermgmt/pkg/service/role.go
+++ b/components/usermgmt/pkg/service/role.go
@@ -159,8 +159,6 @@ func (s *roleService) GetByID(ctx context.Context, id string) (*userv3.Role, err
 }
 
 func (s *roleService) GetByName(ctx context.Context, name string) (*userv3.Role, error) {
-	fmt.Println("name:", name)
-
 	role := &userv3.Role{
 		ApiVersion: apiVersion,
 		Kind:       roleKind,