Improve instrumentation output
Fix promise instrumentation incorrectly triggered on handled errors

Thanks @kriszyp!