diff --git a/uuid.core.inc b/uuid.core.inc
index 69b522a..31993ce 100644
--- a/uuid.core.inc
+++ b/uuid.core.inc
@@ -304,7 +304,8 @@ function user_reference_field_uuid_presave($entity_type, $entity, $field, $insta
 function entityreference_field_uuid_load($entity_type, $entity, $field, $instance, $langcode, &$items) {
   // TODO: This is not really good, but as of now 'entity_property_id_to_uuid()'
   // can't handle a single $item.
-  entity_property_id_to_uuid($items, $field['settings']['target_type'], 'target_id');
+  $info = entity_get_info($field['settings']['target_type']);
+  entity_property_id_to_uuid($items, $field['settings']['target_type'], $info['entity keys']['id']);
 }
 
 /**
@@ -313,7 +314,8 @@ function entityreference_field_uuid_load($entity_type, $entity, $field, $instanc
 function entityreference_field_uuid_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
   // TODO: This is not really good, but as of now 'entity_property_id_to_uuid()'
   // can't handle a single $item.
-  entity_property_uuid_to_id($items, $field['settings']['target_type'], 'target_id');
+  $info = entity_get_info($field['settings']['target_type']);
+  entity_property_uuid_to_id($items, $field['settings']['target_type'], $info['entity keys']['id']);
 }
 
 /**
diff --git a/uuid.entity.inc b/uuid.entity.inc
index 50081c3..044ef42 100644
--- a/uuid.entity.inc
+++ b/uuid.entity.inc
@@ -312,7 +312,7 @@ function entity_uuid_delete($entity_type, $uuid) {
     // Fetch the local ID by its UUID.
     $ids = entity_get_id_by_uuid($entity_type, array($uuid));
     $id = reset($ids);
-
+    $entity = entity_load($entity_type, array($id));
     // Let other modules transform UUID references to local ID references.
     $hook = 'entity_uuid_delete';
     foreach (module_implements($hook) as $module) {
@@ -322,6 +322,9 @@ function entity_uuid_delete($entity_type, $uuid) {
       }
     }
 
+    if (empty($entity)) {
+      return FALSE;
+    }
     // Delete the entity.
     return entity_delete($entity_type, $id);
   }