diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseDataGridViewRow.cs b/XenAdmin/Dialogs/LicenseManager/LicenseDataGridViewRow.cs
index 73c7a2066..8f6104a3f 100644
--- a/XenAdmin/Dialogs/LicenseManager/LicenseDataGridViewRow.cs
+++ b/XenAdmin/Dialogs/LicenseManager/LicenseDataGridViewRow.cs
@@ -223,7 +223,7 @@ namespace XenAdmin.Dialogs
 
         public bool HelperUrlRequired
         {
-            get { return Helpers.ClearwaterOrGreater(XenObject.Connection); }  // CA-115256
+            get { return XenObject == null ? false : Helpers.ClearwaterOrGreater(XenObject.Connection); }  // CA-115256
         }
 
         public Status RowStatus
diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs b/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs
index 3a51cad4b..7f76c476a 100644
--- a/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs
+++ b/XenAdmin/Dialogs/LicenseManager/LicenseManager.cs
@@ -200,7 +200,7 @@ namespace XenAdmin.Dialogs
             Program.Invoke(this, delegate
                                      {
                                          LicenseDataGridViewRow lRow = row as LicenseDataGridViewRow;
-                                         if(lRow == null)
+                                         if(lRow == null || lRow.XenObject == null)
                                              return;
 
                                          summaryPanel.Title = lRow.XenObject.Name;