fixes for null service issue and hangs
Merge pull request #14 from n8fr8/bug_service_null

fixes for null service issue and hangs