Add cf
Simplify exception handling