Tweak to add URL on errors