diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx
index 2c94c5ff..004c1c4a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx
@@ -13,7 +13,7 @@
                 <ItemTemplate>
                     <div class="Quota">
                         <div class="Left">
-                            <%# GetQuotaTitle((string)Eval("QuotaName"), (string)Eval("QuotaDescription"))%>:
+                            <%# GetQuotaTitle((string)Eval("QuotaName"), (object)Eval("QuotaDescription"))%>:
                         </div>
                         <div class="Viewer">
                             <uc1:QuotaViewer ID="quota" runat="server"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx.cs
index 57d46492..86828fe7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotasControl.ascx.cs
@@ -76,11 +76,11 @@ namespace WebsitePanel.Portal
             return new DataView(dsQuotas.Tables[1], "GroupID=" + groupId.ToString(), "", DataViewRowState.CurrentRows);
         }
 
-        public string GetQuotaTitle(string quotaName, string quotaDescription)
+        public string GetQuotaTitle(string quotaName, object quotaDescription)
         {
-            return quotaName.Contains("ServiceLevel") ? 
-                                                      (string.IsNullOrEmpty(quotaDescription) ? 
-                                                                                             string.Empty : quotaDescription).ToString()
+            string description = (quotaDescription.GetType() == typeof(System.DBNull)) ? string.Empty : (string)quotaDescription;
+
+            return quotaName.Contains("ServiceLevel") ? description
                                                       : GetSharedLocalizedString("Quota." + quotaName);
         }
     }