--- media_mover/contrib/mm_node/mm_node.module	Tue Feb 16 15:18:40 2010
+++ media_mover/contrib/mm_node/mm_node.module	Sat Feb 20 16:19:52 2010
@@ -684,7 +684,7 @@
         '#type' => 'select',
         '#title' => t('Save node in language'),
         '#description' => t('Save the node in this language when creating it'),
-        '#options' => $options['name'],
+        '#options' => $options,
         '#default_value' => $configuration['node_save_language'],
       );
     }
--- media_mover/contrib/mm_cck/mm_cck.module	Tue Feb 16 15:18:40 2010
+++ media_mover/contrib/mm_cck/mm_cck.module	Sat Feb 20 16:38:40 2010
@@ -253,15 +253,15 @@
   // language options
   if (module_exists('locale')) {
     $options = locale_language_list();
     $form['mm_cck_'. $configuration['verb']]['node_create_'. $configuration['verb']]['mm_cck_save_language_'. $configuration['verb']] = array(
       '#type' => 'select',
       '#title' => t('Save node in language'),
       '#description' => t('Save the node in this language when creating it'),
-      '#options' => $options['name'],
+      '#options' => $options,
       '#default_value' => $configuration['mm_cck_save_language_'. $configuration['verb']],
     );
   }
 
   // ------------
   $form['mm_cck_'. $configuration['verb']]['mm_cck_file_replace_'. $configuration['verb']] = array(
     '#type' => 'checkbox',
@@ -362,15 +362,17 @@
 function mm_cck_node_save($configuration, &$file) {
   // get the path to the file to operate on. We need this to pass out of the function
   $filepath = media_mover_api_config_current_file($file);
 
   // is there a node attached to this file?
   $node = media_mover_api_get_node_from_file($file);
   // Get CCK content
-  content_load($node);
+  if ($node) {
+    content_load($node);
+  }
 
   // get the field that we will save to
   $field = content_fields($configuration['mm_cck_field_save_'. $configuration['verb']]);
 
   // We have to have a file on the local file system so that CCK does not die
   // @TODO PHP Stream Wrappers should address this
   if (! $local_file = mm_cck_find_local_file($file)) {
@@ -434,15 +436,15 @@
 	  if (! $node->body = $configuration['mm_cck_body_default_'. $configuration['verb']]) {
 	  	if (! $node->body = $file['data']['node']->body) {
 	  		$node->body = '';
 	  	}
 	  }
 
 	  // if we have a language setting
-	  $node->language = $configuration['mm_cckn_save_language_'. $configuration['verb']] ? $configuration['mm_ccknode_save_language'] : null;
+	  $node->language = $configuration['mm_cck_save_language_'. $configuration['verb']] ? $configuration['mm_cck_save_language_'. $configuration['verb']] : null;
 
 	  // node options
 	  $node->comment = $configuration['mm_cck_save_options_'. $configuration['verb']]['comment'] ? 2 : 0;
 	  $node->status = $configuration['mm_cck_save_options_'. $configuration['verb']]['status'] ? 1 : 0;
 	  $node->sticky = $configuration['mm_cck_save_options_'. $configuration['verb']]['sticky'] ? 1 : 0;
 	  $node->promote = $configuration['mm_cck_save_options_'. $configuration['verb']]['promote'] ? 1 : 0;
 
--- media_mover/media_mover_api.module	Mon Dec 28 01:42:07 2009
+++ media_mover/media_mover_api.module	Sat Feb 20 11:26:09 2010
@@ -497,15 +497,15 @@
  * @param int $nid
  */
 function media_mover_api_run_config_harvest($config, $verb, $nid) {
   // check to see if there are any files to harvest for this configuration
   // and make sure that no other harvest is running.
   if (! media_mover_api_harvest_lock($config)) {
     // set some output display
-    $output .= t('Harvesting.... ') .'<br />';
+    $output = t('Harvesting.... ') .'<br />';
     $files = module_invoke($config->{$verb}->module, 'media_mover', $verb, $config->{$verb}->action, $config->{$verb}->configuration, null, $config, $nid);
     $output .= t('Configuration process: <em>harvest</em> found !count files', array('!count' => count($files))) .'<br />';
     // store the harvested files
     if (count($files)) {
       foreach ($files as $file) {
         // save harvested file
         media_mover_api_file_db_add($file, $config->cid, MMA_FILE_STATUS_HARVESTED);