Small changes to exception filter