Defensively check tag for non null
Defensively check tag for non null

klightspeed/EDDiscovery,klightspeed/EDDiscovery,klightspeed/EDDiscovery,EDDiscovery/EDDiscovery,andreaspada/EDDiscovery,EDDiscovery/EDDiscovery,EDDiscovery/EDDiscovery,andreaspada/EDDiscovery