Code

re-enabled "expected" exception handlers