diff --git a/sites/all/modules/uuid_features/includes/uuid_node.features.inc b/sites/all/modules/uuid_features/includes/uuid_node.features.inc
index 542e115..bf34a7b 100644
--- a/sites/all/modules/uuid_features/includes/uuid_node.features.inc
+++ b/sites/all/modules/uuid_features/includes/uuid_node.features.inc
@@ -129,7 +129,7 @@ function uuid_node_features_rebuild($module) {
 
       // Find the matching UUID, with a fresh cache.
       $nids = entity_get_id_by_uuid('node', array($node->uuid));
-      $nid = $nids[$node->uuid];
+      $nid = array_key_exists($node->uuid, $nids) ? $nids[$node->uuid] : FALSE;
       if(!empty($nid)) {
           $existing = node_load($nid, NULL, TRUE);
           if (!empty($existing)) {
diff --git a/sites/all/modules/uuid_features/includes/uuid_term.features.inc b/sites/all/modules/uuid_features/includes/uuid_term.features.inc
index ef36dc5..222236c 100644
--- a/sites/all/modules/uuid_features/includes/uuid_term.features.inc
+++ b/sites/all/modules/uuid_features/includes/uuid_term.features.inc
@@ -10,7 +10,7 @@
  */
 function uuid_taxonomy_term_find($uuid) {
   $ids = entity_get_id_by_uuid('taxonomy_term', array($uuid));
-  return $ids[$uuid];
+  return array_key_exists($uuid, $ids) ? $ids[$uuid] : FALSE;
 }
 
 /**