added some exceptions