Continued to improve resilience of geocode.py to failure.