diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py
index 84b6ff9..c87de6f 100644
--- a/wo/cli/plugins/site.py
+++ b/wo/cli/plugins/site.py
@@ -30,6 +30,7 @@ class WOSiteController(CementBaseController):
         label = 'site'
         stacked_on = 'base'
         stacked_type = 'nested'
+        exit_on_close = True
         description = ('Performs website specific operations')
         arguments = [
             (['site_name'],
@@ -249,6 +250,7 @@ class WOSiteEditController(CementBaseController):
         label = 'edit'
         stacked_on = 'site'
         stacked_type = 'nested'
+        exit_on_close = True
         description = ('Edit Nginx configuration of site')
         arguments = [
             (['site_name'],
@@ -302,6 +304,7 @@ class WOSiteCreateController(CementBaseController):
         label = 'create'
         stacked_on = 'site'
         stacked_type = 'nested'
+        exit_on_close = True
         description = ('this commands set up configuration and installs '
                        'required files as options are provided')
         arguments = [
@@ -806,6 +809,7 @@ class WOSiteUpdateController(CementBaseController):
         label = 'update'
         stacked_on = 'site'
         stacked_type = 'nested'
+        exit_on_close = True
         description = ('This command updates websites configuration to '
                        'another as per the options are provided')
         arguments = [
@@ -1742,6 +1746,7 @@ class WOSiteDeleteController(CementBaseController):
         label = 'delete'
         stacked_on = 'site'
         stacked_type = 'nested'
+        exit_on_close = True
         description = 'delete an existing website'
         arguments = [
             (['site_name'],
@@ -1879,6 +1884,7 @@ class WOSiteListController(CementBaseController):
         label = 'list'
         stacked_on = 'site'
         stacked_type = 'nested'
+        exit_on_close = True
         description = 'List websites'
         arguments = [
             (['--enabled'],
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index 37f2bcc..12732cd 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -44,6 +44,7 @@ class WOStackController(CementBaseController):
         label = 'stack'
         stacked_on = 'base'
         stacked_type = 'nested'
+        exit_on_close = True
         description = 'Stack command manages stack operations'
         arguments = [
             (['--all'],
diff --git a/wo/cli/plugins/stack_services.py b/wo/cli/plugins/stack_services.py
index 4060fc3..a9b7550 100644
--- a/wo/cli/plugins/stack_services.py
+++ b/wo/cli/plugins/stack_services.py
@@ -12,6 +12,7 @@ class WOStackStatusController(CementBaseController):
         label = 'stack_services'
         stacked_on = 'stack'
         stacked_type = 'embedded'
+        exit_on_close = True
         description = 'Check the stack status'
 
     @expose(help="Start stack services")
diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py
index 7c35642..d9b1e85 100644
--- a/wo/cli/plugins/stack_upgrade.py
+++ b/wo/cli/plugins/stack_upgrade.py
@@ -20,6 +20,7 @@ class WOStackUpgradeController(CementBaseController):
         label = 'upgrade'
         stacked_on = 'stack'
         stacked_type = 'nested'
+        exit_on_close = True
         description = ('Upgrade stack safely')
         arguments = [
             (['--all'],
diff --git a/wo/core/logging.py b/wo/core/logging.py
index 84a3508..89a53da 100644
--- a/wo/core/logging.py
+++ b/wo/core/logging.py
@@ -24,6 +24,7 @@ class Log:
         if exit:
             self.app.close(1)
 
+
     def info(self, msg, end='\n', log=True):
         """
         Logs info messages into log file