change safety check to catalog name