more exceptions changed