Changed exception handling (part 1)