diff --git a/heat/objects/raw_template.py b/heat/objects/raw_template.py
index af20200726..9cab9691c4 100644
--- a/heat/objects/raw_template.py
+++ b/heat/objects/raw_template.py
@@ -47,7 +47,8 @@ class RawTemplate(
             tpl[field] = db_tpl[field]
 
         # If any of the parameters were encrypted, then decrypt them
-        if env_fmt.ENCRYPTED_PARAM_NAMES in tpl.environment:
+        if (tpl.environment is not None and
+                env_fmt.ENCRYPTED_PARAM_NAMES in tpl.environment):
             parameters = tpl.environment[env_fmt.PARAMETERS]
             encrypted_param_names = tpl.environment[
                 env_fmt.ENCRYPTED_PARAM_NAMES]