Fix exception on invalid service
Merge pull request #145 from mdlayher/master

Fix exception on invalid service