From 6797680654b22b7b56f5cf53aeec110a5d6f92cc Mon Sep 17 00:00:00 2001
From: Addison Beck <addison@bitwarden.com>
Date: Tue, 23 Jul 2024 16:18:57 -0400
Subject: [PATCH] Handle a previously unhandled null case (#4533)

---
 src/Infrastructure.Dapper/Repositories/CollectionRepository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
index 81d45bcf43..30956c8255 100644
--- a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
@@ -197,7 +197,7 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
 
             var collectionDetails = await results.ReadFirstOrDefaultAsync<CollectionAdminDetails>();
 
-            if (!includeAccessRelationships) return collectionDetails;
+            if (!includeAccessRelationships || collectionDetails == null) return collectionDetails;
 
             collectionDetails.Groups = (await results.ReadAsync<CollectionAccessSelection>()).ToList();
             collectionDetails.Users = (await results.ReadAsync<CollectionAccessSelection>()).ToList();