Fix a bug where we don't return an error.
Merge pull request #1231 from brendandburns/service

Fix a bug where we don't return an error.