*   Fix `wait` hanging at server exception