I am not sure we want to change this in our code before this gets resolved on CDI side.
Like I said in CDI-743, the code doesn't account for providers throwing ISE albeit that case will likely be very rare.