Issue #858 Correct the error message
Merge pull request #881 from mozilla-services/issue_858

Issue #858 Correct the error message