Close #384 - reset locations.yml on error
Close #383 - swallow exceptions once and for all