Fix #342 Originating stack traces are properly set

I rewrote the test because simply adding the try-catch was still making it fail. I think the new test and the new code does clear up a lot of the confusion now though.

Fixes #342