Correctly put exception in context
Merge pull request #45 from odolbeau/correct-exception-context

Correctly put exception in context