Hot exception changes