Typo and minor exception tweaks for consistency
Merge pull request #348 from redler/patch-1

Typo and minor exception tweaks for consistency