diff --git a/includes/uuid_bean.features.inc b/includes/uuid_bean.features.inc
index 0d6ae8c..12686c1 100644
--- a/includes/uuid_bean.features.inc
+++ b/includes/uuid_bean.features.inc
@@ -24,6 +24,7 @@ function uuid_bean_features_export_options() {
       ));
     }
   }
+  drupal_alter('uuid_bean_features_export_options', $options);
   return $options;
 }
 
diff --git a/includes/uuid_field_collection.features.inc b/includes/uuid_field_collection.features.inc
index 9bdcd63..9baed1e 100644
--- a/includes/uuid_field_collection.features.inc
+++ b/includes/uuid_field_collection.features.inc
@@ -9,35 +9,33 @@
  */
 function uuid_field_collection_features_export_options() {
   $options = array();
-
   $all_ids = array();
 
   // Only allow enabled bundles to be exported.
-  $enabled_bundles = variable_get('uuid_features_entity_field_collection_item', array());
-  $enabled_bundles = array_filter($enabled_bundles);
-
-  $efq_field_collection_items = new EntityFieldQuery();
-  $efq_field_collection_items->entityCondition('entity_type', 'field_collection_item');
-  $efq_field_collection_items->entityCondition('bundle', $enabled_bundles);
-  $result = $efq_field_collection_items->execute();
-
-  if (!empty($result['field_collection_item'])) {
-    $all_ids = array_keys($result['field_collection_item']);
-  }
+  $enabled_bundles = variable_get('uuid_features_entity_field_collection_item', FALSE);
+  if ($enabled_bundles) {
+    $efq_field_collection_items = new EntityFieldQuery();
+    $efq_field_collection_items->entityCondition('entity_type', 'field_collection_item');
+    $efq_field_collection_items->entityCondition('bundle', $enabled_bundles);
+    $result = $efq_field_collection_items->execute();
+
+    if (!empty($result['field_collection_item'])) {
+      $all_ids = array_keys($result['field_collection_item']);
+    }
 
-  $items = entity_load('field_collection_item', $all_ids);
+    $items = entity_load('field_collection_item', $all_ids);
 
-  foreach ($items as $item) {
-    $info = $item->instanceInfo();
+    foreach ($items as $item) {
+      $info = $item->instanceInfo();
 
-    $options[$item->uuid] = t('@type: @title', array(
-      '@type' => $info['label'],
-      '@title' => $item->defaultLabel(),
-    ));
+      $options[$item->uuid] = t('@type: @title', array(
+        '@type' => $info['label'],
+        '@title' => $item->defaultLabel(),
+      ));
+    }
   }
 
   drupal_alter('uuid_field_collection_features_export_options', $options);
-
   return $options;
 }
 
diff --git a/includes/uuid_node.features.inc b/includes/uuid_node.features.inc
index e5a63bc..72ac1a0 100755
--- a/includes/uuid_node.features.inc
+++ b/includes/uuid_node.features.inc
@@ -9,26 +9,23 @@
  */
 function uuid_node_features_export_options() {
   $options = array();
-  $types = node_type_get_names();
-
-  // Only allow enabled bundles to be exported.
-  $enabled_bundles = variable_get('uuid_features_entity_node', array());
-  $enabled_bundles = array_filter($enabled_bundles);
-
-  $query = db_select('node')
-    ->fields('node', array('nid', 'title', 'type', 'uuid'))
-    ->orderBy('type')
-    ->orderBy('title')
-    ->condition('type', $enabled_bundles);
-
-  $results = $query->execute();
-  foreach ($results as $node) {
-    $options[$node->uuid] = t('@type: @title',
-      array(
+
+  // Check what content types are enabled for uuid features export.
+  $enabled_types = variable_get('uuid_features_entity_node', FALSE);
+  if (!empty($enabled_types)) {
+    $types = node_type_get_types();
+    $query = db_select('node', 'n');
+    $query->fields('n', array('nid', 'title', 'type', 'uuid'))
+      ->condition('type', $enabled_types)
+      ->orderBy('type')
+      ->orderBy('title');
+    $nodes = $query->execute()->fetchAll();
+    foreach ($nodes as $node) {
+      $options[$node->uuid] = t('@type: @title', array(
         '@type' => $types[$node->type],
         '@title' => $node->title,
-      )
-    );
+      ));
+    }
   }
 
   drupal_alter('uuid_node_features_export_options', $options);