Fixup some incorrect Exception types