Merge "repo_pull: Refactor error handling"