diff --git a/services/graph/pkg/identity/cache.go b/services/graph/pkg/identity/cache.go
index 2801e6a770d..5e2668fcaca 100644
--- a/services/graph/pkg/identity/cache.go
+++ b/services/graph/pkg/identity/cache.go
@@ -142,6 +142,9 @@ func (cache IdentityCache) GetGroup(ctx context.Context, groupID string) (libreg
 	var group libregraph.Group
 	if item := cache.groups.Get(groupID); item == nil {
 		gatewayClient, err := cache.gatewaySelector.Next()
+		if err != nil {
+			return group, errorcode.New(errorcode.GeneralException, err.Error())
+		}
 		cs3GroupID := &cs3Group.GroupId{
 			OpaqueId: groupID,
 		}