More fixes for the case a repository is missing.