fix exception when throwing exception
fix exception when throwing exception

cboling/xos,cboling/xos,jermowery/xos,xmaruto/mcord,xmaruto/mcord,xmaruto/mcord,jermowery/xos,xmaruto/mcord,jermowery/xos,cboling/xos,jermowery/xos,cboling/xos,cboling/xos