Exception tweaking