diff --git a/keepercommander/commands/enterprise.py b/keepercommander/commands/enterprise.py
index 5c873ca36..07eee0020 100644
--- a/keepercommander/commands/enterprise.py
+++ b/keepercommander/commands/enterprise.py
@@ -1201,7 +1201,7 @@ def execute(self, params, **kwargs):
                 logging.warning('Node \'%s\' already exists: Skipping.', node['data'].get('displayname'))
 
             if not unmatched_nodes:
-                raise CommandError('enterprise-node', 'No nodes to add.')
+                return
 
             if parent_id is None:
                 for node in params.enterprise['nodes']:
diff --git a/keepercommander/commands/msp.py b/keepercommander/commands/msp.py
index 950d6bf0a..b267a2b1d 100644
--- a/keepercommander/commands/msp.py
+++ b/keepercommander/commands/msp.py
@@ -985,6 +985,12 @@ def execute(self, params, **kwargs):
             seats = 2147483647
 
         name = kwargs['name']
+        managed_companies = params.enterprise.get('managed_companies', [])
+        existing_mc = get_mc_by_name_or_id(managed_companies, name)
+        if existing_mc:
+            logging.warning('Managed company \'%s\' already exists: Skipping', name)
+            return
+
         tree_key = utils.generate_aes_key()
         rq = {
             'command': 'enterprise_registration_by_msp',