correct error message and remove redundant check

  - also updated the tests
Merge pull request #22 from aaylward/minorcleanup

correct error message and remove redundant check