Fix EH handling issue in last change: