Merge pull request #106 from bryan-m-hughes/master

Cleaned up exception parsing and fixed a few bugs