diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs index 78b63d5b..c9c91cbe 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs @@ -3073,8 +3073,11 @@ namespace WebsitePanel.EnterpriseServer } ResultObject res = exchange.SetMailBoxArchiving(orgId, accountName, EnableArchiving, archiveQuotaKB, archiveWarningQuotaKB, RetentionPolicy); - result.ErrorCodes.AddRange(res.ErrorCodes); - result.IsSuccess = result.IsSuccess && res.IsSuccess; + if (res != null) + { + result.ErrorCodes.AddRange(res.ErrorCodes); + result.IsSuccess = result.IsSuccess && res.IsSuccess; + } } public static List GetExchangeRetentionPolicyTags(int itemId)