Instead of returning null here and below, can you please return a GeoData with country = "", and lat/lon = 0/0?  This will be backwards compatible with what we used to return, which I suspect the UI relies on.