Contains an small fix and improve one error message

The bulk of the work (check_one_repo) was stashed.