diff --git a/vmware_nsx/plugins/nsx_v/availability_zones.py b/vmware_nsx/plugins/nsx_v/availability_zones.py
index 4f7f5735bd..a427b86388 100644
--- a/vmware_nsx/plugins/nsx_v/availability_zones.py
+++ b/vmware_nsx/plugins/nsx_v/availability_zones.py
@@ -214,8 +214,10 @@ class NsxVAvailabilityZones(common_az.ConfiguredAvailabilityZones):
         """
         resources = set()
         for az in self.list_availability_zones_objects():
-            resources.add(az.resource_pool)
-            resources.add(az.datastore_id)
+            if az.resource_pool:
+                resources.add(az.resource_pool)
+            if az.datastore_id:
+                resources.add(az.datastore_id)
             if az.ha_datastore_id:
                 resources.add(az.ha_datastore_id)
 
diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py
index 23e00e5017..4d28d36f91 100644
--- a/vmware_nsx/plugins/nsx_v/plugin.py
+++ b/vmware_nsx/plugins/nsx_v/plugin.py
@@ -4312,7 +4312,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
         # Add the availability zones resources
         az_resources = self._availability_zones_data.get_inventory()
         for res in az_resources:
-            inventory.append((res, 'availability_zones'))
+            inventory.append((res, 'availability_zone ' + res))
 
         if cfg.CONF.nsxv.use_nsx_policies:
             # if use_nsx_policies=True, the default policy must be defined