Fixed #16383

If we just do raise e, it will be caught by last `except` clause and also in the debug page in the stack trace, things are easier to understand this way as the line which actually raised exception is seen...if we do what you suggest, we might not get that.