Improve error handling, Travis CI