Index: cck/modules/content_migrate/content_migrate.filefield.inc
===================================================================
@@ -201,35 +201,39 @@
       };
 
       $file = db_select('files', 'f')->fields('f', array('fid', 'uid', 'filename', 'filepath', 'filemime', 'filesize', 'timestamp', 'status'))->condition('fid', $fid)->execute()->fetchObject();
+      //////////////////////////////////////////// Patched By Stephen ////////////////////////////////////////////
+      //if( ($file->fid!='') && ($file->uid!='') && ($file->filename!='') && ($file->filemime!='') && ($file->filesize!='') && ($file->status!='') && ($file->timestamp!='') ){
+      if(is_object($file)){
+        $basename = variable_get('file_directory_path', conf_path() . '/files');
+        $scheme = file_default_scheme() . '://';
 
-      $basename = variable_get('file_directory_path', conf_path() . '/files');
-      $scheme = file_default_scheme() . '://';
+        // We will convert filepaths to uri using the default scheme
+        // and stripping off the existing file directory path.
+        $file->uri = $scheme . str_replace($basename, '', $file->filepath);
+        $file->uri = file_stream_wrapper_uri_normalize($file->uri);
+        unset($file->filepath);
 
-      // We will convert filepaths to uri using the default scheme
-      // and stripping off the existing file directory path.
-      $file->uri = $scheme . str_replace($basename, '', $file->filepath);
-      $file->uri = file_stream_wrapper_uri_normalize($file->uri);
-      unset($file->filepath);
+        // Insert into the file_managed table.
+        // Each fid should only be stored once in file_managed.
+        db_merge('file_managed')
+          ->key(array(
+            'fid' => $file->fid,
+          ))
+          ->fields(array(
+            'uid' => $file->uid,
+            'filename' => $file->filename,
+            'uri' => $file->uri,
+            'filemime' => $file->filemime,
+            'filesize' => $file->filesize,
+            'status' => $file->status,
+            'timestamp' => $file->timestamp,
+          ))
+          ->execute();
 
-      // Insert into the file_managed table.
-      // Each fid should only be stored once in file_managed.
-      db_merge('file_managed')
-        ->key(array(
-          'fid' => $file->fid,
-        ))
-        ->fields(array(
-          'uid' => $file->uid,
-          'filename' => $file->filename,
-          'uri' => $file->uri,
-          'filemime' => $file->filemime,
-          'filesize' => $file->filesize,
-          'status' => $file->status,
-          'timestamp' => $file->timestamp,
-        ))
-        ->execute();
-
-      // Add the usage entry for the file.
-      file_usage_add($file, 'file', 'node', $nid);
+        // Add the usage entry for the file.
+        file_usage_add($file, 'file', 'node', $nid);
+      }
+      //////////////////////////////////////////// Patched By Stephen //////////////////////////////////////////// 
       break;
   }
-}
\ No newline at end of file
+}