Clarify exception handler scope in contextlib

Moved explicit raise from inside try to try...else.