added exceptions
added some exceptions