Small changes in exception catching