diff --git a/cloudbender/jinja.py b/cloudbender/jinja.py
index 995b5c2..497a297 100644
--- a/cloudbender/jinja.py
+++ b/cloudbender/jinja.py
@@ -156,8 +156,10 @@ def inline_yaml(block):
 
 
 def JinjaEnv(template_locations=[]):
+    LoggingUndefined = jinja2.make_logging_undefined(logger=logger, base=Undefined)
     jenv = jinja2.Environment(trim_blocks=True,
                               lstrip_blocks=True,
+                              undefined=LoggingUndefined,
                               extensions=['jinja2.ext.loopcontrols', 'jinja2.ext.do'])
 
     if template_locations:
diff --git a/cloudbender/stack.py b/cloudbender/stack.py
index 59f507d..529d1bb 100644
--- a/cloudbender/stack.py
+++ b/cloudbender/stack.py
@@ -166,6 +166,8 @@ class Stack(object):
     Description: Project / Namespace this stack is part of
 """
             self.cfn_template = re.sub(_res, '', self.cfn_template)
+        else:
+            self.dependencies.add("CloudBender")
 
         include = []
         search_refs(self.cfn_data, include, self.mode)