making catalogs optional
Branch: catalog_checks