diff --git a/ffdc/ffdc_collector.py b/ffdc/ffdc_collector.py
index 920f0fb..cf07c8e 100644
--- a/ffdc/ffdc_collector.py
+++ b/ffdc/ffdc_collector.py
@@ -586,9 +586,11 @@
 
             for command in list_of_commands:
                 try:
+                    command = self.yaml_env_and_plugin_vars_populate(command)
                     filename = command.split('ls -AX')[1]
+                    filename = self.yaml_env_and_plugin_vars_populate(filename)
                 except IndexError:
-                    self.logger.info("\t\tInvalid command %s" % command)
+                    self.logger.error("\t\tInvalid command %s" % command)
                     continue
 
                 cmd_exit_code, err, response = \