diff --git a/includes/uuid_file_entity.features.inc b/includes/uuid_file_entity.features.inc
index b1b8f4c..a26500d 100644
--- a/includes/uuid_file_entity.features.inc
+++ b/includes/uuid_file_entity.features.inc
@@ -80,6 +80,10 @@ function uuid_file_entity_features_export_render($module, $data) {
       $export_var = 'uuid_features_file_url';
       break;
 
+    case 'packaged':
+      $export_var = 'uuid_features_packaged_file_path';
+      break;
+
     default:
     case 'inline':
       $export_var = 'uuid_features_file_data';
@@ -205,7 +209,7 @@ function uuid_file_entity_features_rebuild_files($files, $module, $max_nesting =
       drupal_alter('uuid_file_entity_features_rebuild', $file, $module);
 
       // Already calls file_save().
-      _uuid_features_file_field_import_file($file, 'file');
+      _uuid_features_file_field_import_file($file, $module);
     }
     catch (Exception $e) {
       $second_run_files[] = $data;
diff --git a/uuid_features.module b/uuid_features.module
index 6ac96d8..0f5957c 100644
--- a/uuid_features.module
+++ b/uuid_features.module
@@ -576,7 +576,7 @@ function uuid_features_file_export($file, $export_mode) {
   }
   elseif ($export_mode == 'packaged') {
     $assets_path = variable_get('uuid_features_packaged_file_assets_path', 'assets');
-    $export_data = $assets_path . '/' . $file->filename;
+    $export_data = $assets_path . '/' . drupal_basename($file->uri);
   }
   // Default is 'inline' export mode.
   else {
@@ -643,12 +643,19 @@ function uuid_features_file_field_import(&$import, $entity_type, $module = NULL)
 function _uuid_features_file_field_import_file(&$file, $module = NULL) {
   // This is here for historical reasons to support older exports.  It can be
   // removed in the next major version.
-  $file->uri = strtr($file->uri, array('#FILES_DIRECTORY_PATH#' => 'public:/'));
+  if (isset($file->uri)) {
+    $file->uri = strtr($file->uri, array('#FILES_DIRECTORY_PATH#' => 'public:/'));
+  }
 
+  // The file is referenced but not defined because it's already
+  // contained in a file_entity include
+  if (!isset($file->uri) && module_exists('file_entity')) {
+    return FALSE;
+  }
   // The file is already in the right location AND either the
   // uuid_features_file_path is not set or the uuid_features_file_path and
   // filepath contain the same file.
-  if (is_file($file->uri) &&
+  elseif (isset($file->uri) && isset($file->uri) && is_file($file->uri) &&
     (
       (!isset($file->uuid_features_file_path) || !is_file($file->uuid_features_file_path)) ||
       (