diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
index 2047a356..9f4ceb34 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
@@ -646,11 +646,17 @@ namespace WebsitePanel.EnterpriseServer
                     DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false);
 
                 // clear binding left overs
+                List<ServerBinding> newBindings = new List<ServerBinding>();
                 WebServer web = new WebServer();
                 ServiceProviderProxy.Init(web, siteItem.ServiceId);
-                WebSite site = web.GetSite(siteItem.SiteId);
-                List<ServerBinding> newBindings = new List<ServerBinding>();
-                web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true);
+                try
+                {
+                    web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true);
+                }
+                catch (Exception)
+                {
+
+                }
 
                 // update site item
                 siteItem.SiteIPAddressId = addressId;
@@ -744,9 +750,16 @@ namespace WebsitePanel.EnterpriseServer
                 // clear binding left overs
                 WebServer web = new WebServer();
                 ServiceProviderProxy.Init(web, siteItem.ServiceId);
-                WebSite site = web.GetSite(siteItem.SiteId);
                 List<ServerBinding> newBindings = new List<ServerBinding>();
-                web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true);
+
+                try
+                {
+                    web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true);
+                }
+                catch (Exception)
+                {
+
+                }
 
 
                 //figure out the PackageAddressId
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs
index d41f99f2..6bd53596 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs
@@ -441,7 +441,8 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
                     int i = 0;
                     while (i < iisObject.Bindings.Count)
                     {
-                        if (String.Equals(iisObject.Bindings[i].Protocol, Uri.UriSchemeHttp, StringComparison.InvariantCultureIgnoreCase))
+                        if ((String.Equals(iisObject.Bindings[i].Protocol, Uri.UriSchemeHttp, StringComparison.InvariantCultureIgnoreCase)) | 
+                            (bindings.Length == 0))
                         {
                             iisObject.Bindings.RemoveAt(i);
                             continue;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
index cbb6f7c5..18295438 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
@@ -66,6 +66,7 @@ namespace WebsitePanel.Portal
 			new Tab { Id = "mime", ResourceKey = "Tab.MIMETypes", Quota = Quotas.WEB_MIME, ViewId = "tabMimes" },
 			new Tab { Id = "coldfusion", ResourceKey = "Tab.ColdFusion", Quota = Quotas.WEB_COLDFUSION, ViewId = "tabCF" },
 			new Tab { Id = "webman", ResourceKey = "Tab.WebManagement", Quota = Quotas.WEB_REMOTEMANAGEMENT, ViewId = "tabWebManagement" },
+            new Tab { Id = "SSL", ResourceKey = "Tab.SSL", Quota = Quotas.WEB_SSL, ViewId = "SSL" },
 		};
 
 		private int PackageId
@@ -256,15 +257,13 @@ namespace WebsitePanel.Portal
 			webSitesCustomErrorsControl.BindWebItem(site);
             if (site.SiteIPAddress != null)
             {
-                TabsList.Add(new Tab { Id = "SSL", ResourceKey = "Tab.SSL", Quota = Quotas.WEB_SSL, ViewId = "SSL" });
-                TabsList.ForEach((x) =>
-                {
-                    x.Name = GetLocalizedString(x.ResourceKey);
-                    x.ResourceGroup = x.ResourceGroup ?? ResourceGroups.Web;
-                });
-
+                WebsitesSSLControl.Visible = true;
                 WebsitesSSLControl.BindWebItem(site);
             }
+            else
+            {
+                WebsitesSSLControl.Visible = false;
+            }
 
 			BindVirtualDirectories();