diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
index e49216d7..2f51f9b8 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
@@ -273,19 +273,22 @@ namespace WebsitePanel.EnterpriseServer
 
                 int exchangeServiceId = PackageController.GetPackageServiceId(org.PackageId, ResourceGroups.Exchange);
 
-                ServiceProvider exchange = GetServiceProvider(exchangeServiceId, org.ServiceId);
-                
-				ServiceProviderItemDiskSpace[] itemsDiskspace = exchange.GetServiceItemsDiskSpace(new SoapServiceProviderItem[] { soapOrg });
+                if (exchangeServiceId != 0)
+                {
+                    ServiceProvider exchange = GetServiceProvider(exchangeServiceId, org.ServiceId);
 
-				
-                if (itemsDiskspace != null && itemsDiskspace.Length > 0)
-				{
-					// set disk space
-					org.DiskSpace = (int)Math.Round(((float)itemsDiskspace[0].DiskSpace / 1024 / 1024));
+                    ServiceProviderItemDiskSpace[] itemsDiskspace = exchange.GetServiceItemsDiskSpace(new SoapServiceProviderItem[] { soapOrg });
 
-					// save organization
-					UpdateOrganization(org);
-				}
+
+                    if (itemsDiskspace != null && itemsDiskspace.Length > 0)
+                    {
+                        // set disk space
+                        org.DiskSpace = (int)Math.Round(((float)itemsDiskspace[0].DiskSpace / 1024 / 1024));
+
+                        // save organization
+                        UpdateOrganization(org);
+                    }
+                }
 			}
 			catch (Exception ex)
 			{