Improved exception handling. Don't swallow exception
Merge pull request #389 from jeroenr/master

Improved exception handling. Don't swallow exception