Adjust to reworked exception API.