adapt some exceptions