Replace uses of the old catch function with the new one