error handring
Merge pull request #381 from goldrush/master

error handring