fix exception bug
mere conflict