Exception improvements
Merge pull request #255 from GrahamCampbell/exception-fixes

Exception Improvements