From ede0b7e9ed79ffd12f78b859f338cf2880cb39f1 Mon Sep 17 00:00:00 2001
From: Aaron Godin <aaron.godin@grafana.com>
Date: Mon, 4 Nov 2024 11:18:31 -0600
Subject: [PATCH] IAM - Fix panic from accessing nil serviceAccount (#95681)

Fix panic from accessing nil serviceAccount
---
 pkg/services/serviceaccounts/serviceaccounts.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/services/serviceaccounts/serviceaccounts.go b/pkg/services/serviceaccounts/serviceaccounts.go
index d63b5c92ea2..e405efd418b 100644
--- a/pkg/services/serviceaccounts/serviceaccounts.go
+++ b/pkg/services/serviceaccounts/serviceaccounts.go
@@ -69,6 +69,9 @@ func UIDToIDHandler(saService ServiceAccountRetriever) func(ctx context.Context,
 			OrgID: orgID,
 			UID:   resourceID,
 		})
+		if err != nil {
+			return "", err
+		}
 		return strconv.FormatInt(serviceAccount.Id, 10), err
 	}
 }