Handle error condition where service constant not defined

Surrounded the code with a begin / rescue block
Removed rescue block

Need to handle this better,
Added End that I removed
Merge pull request #3 from afulki/master

Update to fix casing of parameter