Don't assume we got an error message
Merge pull request #4 from Warbo/master

Don't assume we got an error message