- exception handling improved
Merge pull request #93 from hadfl/exception_handling

- exception handling improved