fixes/add_rethrow_in_catch_fix library