handle exception
Merge pull request #96 from DIdiHL/chenxi

handle exception