Merge "Rollback: Catch error when unable to load latest revision data"