Exception bug fix