Minor tweaks on the chaos exceptions.