Improvements to error messages to give more context
Address comments from #54
Merge pull request #54 from pwaller/49-better-errors

Improvements to error messages to give more context