Add exception.
Add new regex.
Add missing repository error handling.