Rethrow

@floitschG Thanks for pointing out the issue with stack traces.  Could you take a quick look?