Various tweaks to exception action