Fix exception issue