Use Service.Name for validation error.
Merge pull request #2390 from ddysher/random-fix

Use Service.Name for validation error.