Revert to version with lock, catch download errors