Minor fix to 1540 to protect for mass
Minor fix to 1540 to protect for mass

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