diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
index 994e8177..532220a4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
@@ -187,9 +187,16 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
             List<Product> products = wpi.GetApplications(categoryId);
             List<GalleryApplication> applications = new List<GalleryApplication>();
 
-            foreach (Product product in products)
+            try
             {
-                applications.Add(MakeGalleryApplicationFromProduct(product));
+                foreach (Product product in products)
+                {
+                    applications.Add(MakeGalleryApplicationFromProduct(product));
+                }
+            }
+            catch(Exception ex)
+            {
+                //
             }
 
             return applications;
@@ -374,7 +381,7 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
                            Id = product.ProductId,
                            Title = product.Title,
                            Author = new Author {Name = product.Author, Uri = product.AuthorUri.ToString()},
-                           IconUrl = product.IconUrl.ToString(),
+                           IconUrl = null == product.IconUrl ? "" : product.IconUrl.ToString(),
                            Version = product.Version,
                            Description = product.LongDescription,
                            Summary = product.Summary,
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
index 843fd123..3ecef0a5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
@@ -187,7 +187,7 @@
     <value>Applications Installer</value>
   </data>
   <data name="ModuleTitle.WebApplicationsGallery" xml:space="preserve">
-    <value>Microsoft Web Application Gallery</value>
+    <value>Web Application Gallery</value>
   </data>
   <data name="ModuleTitle.AuditLog" xml:space="preserve">
     <value>Audit Log</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx
index 1d3d1e32..d4b134f6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx
@@ -445,7 +445,7 @@
     <value>{user} - {space} - Web Site IP Addresses</value>
   </data>
   <data name="PageTitle.SpaceWebApplicationsGallery" xml:space="preserve">
-    <value>{user} - {space} - Microsoft Web Application Gallery</value>
+    <value>{user} - {space} - Web Application Gallery</value>
   </data>
   <data name="PageName.SpaceWeb" xml:space="preserve">
     <value>Web</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx
index 5de7bc20..473f1380 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx
@@ -123,7 +123,7 @@ ul.WPIKeywordList>li {
 					<asp:hyperlink NavigateUrl='<%# EditUrl("ApplicationID", Eval("Id").ToString(), "edit", "SpaceID=" + PanelSecurity.PackageId.ToString()) %>'
 							runat="server" ID="Hyperlink3" ToolTip='<%# Eval("Title") %>'>
 						<asp:Image runat="server" ID="Image1" Width="120" Height="120"
-                            ImageUrl='<%# "~/DesktopModules/WebsitePanel/ResizeImage.ashx?width=120&height=120&url=" + Server.UrlEncode((string)Eval("IconUrl"))  %>'
+                            ImageUrl='<%# GetIconUrlOrDefault((string)Eval("IconUrl"))  %>'
 							AlternateText='<%# Eval("Title") %>'>
 						</asp:Image>
 					</asp:hyperlink>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx.cs
index 08978785..f3d4715a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGallery.ascx.cs
@@ -178,5 +178,15 @@ namespace WebsitePanel.Portal
             }
             ES.Services.WebApplicationGallery.SetResourceLanguage(PanelSecurity.PackageId, lang);
         }
+
+        protected string GetIconUrlOrDefault(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                return "/App_Themes/Default/icons/sphere_128.png";
+            }
+            
+            return "~/DesktopModules/WebsitePanel/ResizeImage.ashx?width=120&height=120&url=" + Server.UrlEncode(url);
+        }
     }
 }
\ No newline at end of file