Removed exceptions
Merge pull request #147 from jaytaph/exceptionfix

Removed exceptions