Added more robust handling of no data being replied

Have seen this on the GRO, no data being returned.