Continuing to add geocode error fixes