Refactored the "catalog with exceptions".