From 004380d788e2272c2b8e115fc4d684301162cd37 Mon Sep 17 00:00:00 2001 From: Reshmee Auckloo Date: Wed, 28 May 2025 07:14:51 +0100 Subject: [PATCH 1/2] fix for bug #4943 --- src/Commands/Admin/UnregisterHubSite.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Commands/Admin/UnregisterHubSite.cs b/src/Commands/Admin/UnregisterHubSite.cs index ad32a8f4d..efa5f1c5a 100644 --- a/src/Commands/Admin/UnregisterHubSite.cs +++ b/src/Commands/Admin/UnregisterHubSite.cs @@ -26,7 +26,7 @@ protected override void ExecuteCmdlet() } else { - props = hubSitesProperties.Single(h => h.SiteUrl.Equals(Site.Url, StringComparison.OrdinalIgnoreCase)); + props = hubSitesProperties.Single(h => !string.IsNullOrEmpty(h.SiteUrl) && h.SiteUrl.Equals(Site.Url, StringComparison.OrdinalIgnoreCase)); } Tenant.UnregisterHubSiteById(props.ID); AdminContext.ExecuteQueryRetry(); From 7cac93bc4ff93ca80d771fe2b510fb733c47dc58 Mon Sep 17 00:00:00 2001 From: Reshmee Auckloo Date: Mon, 28 Jul 2025 12:45:35 +0100 Subject: [PATCH 2/2] Error handling --- src/Commands/Admin/GetTenantRestrictedSearchMode.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Commands/Admin/GetTenantRestrictedSearchMode.cs b/src/Commands/Admin/GetTenantRestrictedSearchMode.cs index 803d11e51..cddfbd54b 100644 --- a/src/Commands/Admin/GetTenantRestrictedSearchMode.cs +++ b/src/Commands/Admin/GetTenantRestrictedSearchMode.cs @@ -10,9 +10,16 @@ public class GetTenantRestrictedSearchMode : PnPSharePointOnlineAdminCmdlet { protected override void ExecuteCmdlet() { - var results = Tenant.GetSPORestrictedSearchMode(); - AdminContext.ExecuteQueryRetry(); - WriteObject(results, true); + try + { + var results = Tenant.GetSPORestrictedSearchMode(); + AdminContext.ExecuteQueryRetry(); + WriteObject(results, true); + } + catch + { + WriteObject("Restricted search mode is currently not set."); + } } } }