Fixed #16383

can we change this to `raise e` to just re-raise the original exception rather than re-evaluating it?