diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
index 532220a4..c931f77f 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
@@ -387,7 +387,7 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
                            Summary = product.Summary,
                            LastUpdated = product.Published,
                            Published = product.Published,
-                           Link = product.Link.ToString(),
+                           Link = (null == product.Link) ? "" : product.Link.ToString(),
                            InstallerFileSize = size
                        };
         }