- Updated implementation to better handle 404s from the service.