Missed two more InvalidOperationException chances
Missed two more InvalidOperationException chances

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