Fixing service crash

Possible fix to service crash.
>>>>>NOT TESTED<<<<<
Merge pull request #9 from BlackVoid/patch-1

Fixing service crash