Merge Harry Chen's Pull Request

紧急修复几个Exception