From d0343eebd169f9bedbdb896566fb0ab861646701 Mon Sep 17 00:00:00 2001
From: jules <130390278+juleslasarte@users.noreply.github.com>
Date: Fri, 3 Nov 2023 11:12:07 -0700
Subject: [PATCH] correct fallback

---
 src/pkg/services/m365/api/groups.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pkg/services/m365/api/groups.go b/src/pkg/services/m365/api/groups.go
index adcb1b5b3..1a928ab9d 100644
--- a/src/pkg/services/m365/api/groups.go
+++ b/src/pkg/services/m365/api/groups.go
@@ -150,15 +150,16 @@ func (c Groups) GetByID(
 		}
 
 		resp, err := service.Client().Groups().Get(ctx, opts)
-		if err != nil {
-			if graph.IsErrResourceLocked(err) {
-				err = clues.Stack(graph.ErrResourceLocked, err)
-			}
 
-			logger.CtxErr(ctx, err).Info("finding group by email, falling back to display name")
+		if err == nil {
+			return getGroupFromResponse(ctx, resp)
 		}
 
-		return getGroupFromResponse(ctx, resp)
+		if graph.IsErrResourceLocked(err) {
+			return nil, graph.Stack(ctx, clues.Stack(graph.ErrResourceLocked, err))
+		}
+
+		logger.CtxErr(ctx, err).Info("finding group by email, falling back to display name")
 	}
 
 	// fall back to display name