Let the caller see exceptions instead of hiding them
Merge remote-tracking branch 'upstream/rewrite' into rewrite
Merge pull request #162 from johanobergman/rewrite

Let the caller see exceptions instead of hiding them