1 files changed, 8 insertions, 3 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index e81da4029..324b306c3 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -422,9 +422,14 @@ class Resource(object):
         """
         if self.type() == resource_type:
             return True
-        ri = self.stack.env.get_resource_info(self.type(),
-                                              self.name)
-        return ri is not None and ri.name == resource_type
+
+        try:
+            ri = self.stack.env.get_resource_info(self.type(),
+                                                  self.name)
+        except exception.ResourceTypeNotFound:
+            return False
+        else:
+            return ri.name == resource_type
 
     def implementation_signature(self):
         """Return a tuple defining the implementation.