fixes manual exception handling
Merge branch 'exception_wrappers'