diff --git a/oslo_service/service.py b/oslo_service/service.py
index e7c8e859..4ef02077 100644
--- a/oslo_service/service.py
+++ b/oslo_service/service.py
@@ -456,8 +456,10 @@ class ProcessLauncher(object):
             status = exc.code
             signo = exc.signo
         except SystemExit as exc:
+            launcher.stop()
             status = exc.code
         except BaseException:
+            launcher.stop()
             LOG.exception('Unhandled exception')
             status = 2