Fix regression on error message. Prevent duplicate errors.
Merge pull request #30 from Scrimmage/fix-duplicate-errors

Fix regression on error message. Prevent duplicate errors.