Add recovery to geocoding helper classes