error check
Merge pull request #5 from neutronest/dongchao

error check