diff --git a/cloudbender/core.py b/cloudbender/core.py
index 17f0482..5251677 100644
--- a/cloudbender/core.py
+++ b/cloudbender/core.py
@@ -79,7 +79,7 @@ class CloudBender(object):
 
 
     def resolve_stacks(self, token):
-        stacks = None
+        stacks = []
 
         # remove optional leading "config/" to allow bash path expansions 
         if token.startswith("config/"):
diff --git a/cloudbender/stack.py b/cloudbender/stack.py
index 965f542..999fe84 100644
--- a/cloudbender/stack.py
+++ b/cloudbender/stack.py
@@ -222,7 +222,7 @@ class Stack(object):
             self._parse_metadata()
 
         else:
-            logger.debug('Using cached cfn template %s.', yaml_file)
+            logger.debug('Using cached cfn template %s.', self.stackname)
 
 
     def validate(self):