Cleanup exception handling code
Merge pull request #29 from jgetto/master

Cleanup exception handling code