- added some exceptions