Tweak: put detailed error reports closer to where the failure occurred