exception tweaks