A couple of tiny error message fixes

This doesn't resolve all of #6, but it does catch the simplest and most common cases.