Handle a couple of cases/exceptions when service have gone away
Merge pull request #345 from Juniper/dsetia-bugfix

Handle a couple of cases/exceptions when service have gone away