added exceptions
updated exceptions