Nit: space and s/CATCH/CATCH_UP_ (also comment)