error check
Merge pull request #5 from joware/travis

error check