Add checks to avoid NPE's while stopping services
1 file changed