Display just a bit more information about where things went wrong so that it's easier to track down.
Merge pull request #137 from davidw/master

Display just a bit more information about where things went wrong