Revert "added exceptions"

This reverts commit e511c1ae96d074b7ab7d6240662e779522d208b2.