removed some exceptions