exception handle changes