diff --git a/includes/entity.wrapper.inc b/includes/entity.wrapper.inc
index 30418c7..8ff0181 100644
--- a/includes/entity.wrapper.inc
+++ b/includes/entity.wrapper.inc
@@ -604,6 +604,10 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
       $id = entity_id($this->type, $data);
       $this->id = isset($id) ? $id : FALSE;
     }
+    elseif (empty($data)){
+      $this->id = FALSE;
+      $this->data = FALSE;
+    }
   }
 
   /**
@@ -707,6 +711,9 @@ class EntityDrupalWrapper extends EntityStructureWrapper {
     elseif ($previous_id != $this->id) {
       $this->updateParent($this->id);
     }
+    elseif ($this->id === FALSE) {
+      $this->updateParent(NULL);
+    }
     return $this;
   }