Lift catch blocks to a level just before the driver function.