Hi @jgogstad, I'm your friendly neighborhood Microsoft Pull Request Bot (You can call me MSBOT). Thanks for your contribution!

This seems like a small (but important) contribution, so no Contribution License Agreement is required at this point. Real humans will now evaluate your PR.

TTYL, MSBOT;

Thanks for contributing the solution. I understand the issue you are reporting but I'm concerned that the proposed code may have an issue as well.
webModulesContainer.invokeOnEndRequest would invoke the module's OnEndRequest which uses the TLS (e.g. here ).
After the proposed changed, the TLS would have already been cleaned up in the "finally" clause.

True, sorry for the lack of proper testing on my part. Pushed a fix that also addresses #298. I restructured the conditionals a bit in order to make the exception handling more readable. As long as you're targeting JRE 1.6, we can't collapse the catch-blocks so the code is duplicated.

Thanks for the fix!