Corrected issue with instrumenting exceptions