added exceptions

tests still not working