Tweak re exceptions