Small changes to exception processing