More fixes for the case a repository is missing.
Merge pull request #8 from ktf/master

More fixes for the case a repository is missing.