diff --git a/tcp_tests/managers/envmanager_devops.py b/tcp_tests/managers/envmanager_devops.py
index 355d6f6..2116e29 100644
--- a/tcp_tests/managers/envmanager_devops.py
+++ b/tcp_tests/managers/envmanager_devops.py
@@ -201,7 +201,7 @@
                  "ssh {login}@{salt_master_host}  # Password: {password}\n"
                  "************************************\n"
                  .format(venv_msg=venv_msg,
-                         env_name=settings.ENV_NAME,
+                         env_name=self._d_env_name,
                          snapshot_name=name,
                          login=settings.SSH_NODE_CREDENTIALS['login'],
                          password=settings.SSH_NODE_CREDENTIALS['password'],
diff --git a/tcp_tests/managers/execute_commands.py b/tcp_tests/managers/execute_commands.py
index 03265c1..de9ab3b 100644
--- a/tcp_tests/managers/execute_commands.py
+++ b/tcp_tests/managers/execute_commands.py
@@ -116,6 +116,10 @@
                 for s in result['stdout']:
                     if s.startswith("Failed:"):
                         failed += int(s.split("Failed:")[1])
+                    if 'Minion did not return. [No response]' in s:
+                        failed += 1
+                    if s.startswith("[CRITICAL]"):
+                        failed += 1
 
                 if result.exit_code != 0:
                     time.sleep(retry_delay)