Handle some cases where row index is outside grid
Handle some cases where row index is outside grid

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