diff --git a/vitrage/entity_graph/processor/processor.py b/vitrage/entity_graph/processor/processor.py
index 8de394b7c..953d404d8 100644
--- a/vitrage/entity_graph/processor/processor.py
+++ b/vitrage/entity_graph/processor/processor.py
@@ -256,11 +256,9 @@ class Processor(processor.ProcessorBase):
     def _calculate_aggregated_state(self, vertex, action):
         LOG.debug("calculate event state")
 
-        if action == EventAction.UPDATE_ENTITY or \
-                action == EventAction.DELETE_ENTITY:
+        if action in [EventAction.UPDATE_ENTITY, EventAction.DELETE_ENTITY,
+                      EventAction.CREATE_ENTITY]:
             graph_vertex = self.entity_graph.get_vertex(vertex.vertex_id)
-        elif action == EventAction.CREATE_ENTITY:
-            graph_vertex = None
         elif action == EventAction.END_MESSAGE:
             return None
         else:
diff --git a/vitrage/synchronizer/plugins/nova/zone/transformer.py b/vitrage/synchronizer/plugins/nova/zone/transformer.py
index c65e1ddd4..b4e755ed0 100644
--- a/vitrage/synchronizer/plugins/nova/zone/transformer.py
+++ b/vitrage/synchronizer/plugins/nova/zone/transformer.py
@@ -167,7 +167,7 @@ class ZoneTransformer(transformer_base.TransformerBase):
             vitrage_id,
             entity_id=host_name,
             entity_category=EntityCategory.RESOURCE,
-            entity_type=self.ZONE_TYPE,
+            entity_type=EntityType.NOVA_HOST,
             entity_state=host_state,
             update_timestamp=timestamp)