Fix some exceptions