Exception handler modified.