exception bug fix