Changed exception handling (part 2)