Exception bug fixed