[MIG-17] [MIG-92] Fixing MetaDataException: Catalog doesn't exist