Fixed exception issue