Simplify exception handlers
#91

pristupa wants to merge simplify-exception-handlers into master

We do not currently have an analysis of these two commits