Merge change 22048 into eclair

* changes:
  Add checks to avoid NPE's while stopping services