--- node_convert.module.original	2011-05-24 08:39:18.042646959 -0400
+++ node_convert.module	2011-05-24 08:39:53.354646959 -0400
@@ -619,10 +619,10 @@ function node_convert_node_convert($nid,
   if ($no_fields_flag == FALSE) {  // If there are cck fields that can be converted
     $additional_data = array();
     foreach ($source_fields as $key => $field) {  // Conversion process for each field
-      $additional_data = node_convert_field_convert($nid, $field, $dest_fields[$key]);
-    }     if (!empty($additional_data)) {
-      db_query("UPDATE {node_revisions} SET body = '%s', teaser = '%s' WHERE nid = %d AND vid = %d",
-      $additional_data['body'], $additional_data['teaser'], $node->nid, $node->vid);
+      $additional_data = node_convert_field_convert($nid, $field, $dest_fields[$key]);       if (!empty($additional_data) && isset($additional_data['body']) && isset($additional_data['teaser'])) {
+        db_query("UPDATE {node_revisions} SET body = '%s', teaser = '%s' WHERE nid = %d AND vid = %d",
+        $additional_data['body'], $additional_data['teaser'], $node->nid, $node->vid);
+      }
     }
   }
   // We collate date to send to the hook implementations
@@ -643,7 +643,7 @@ function node_convert_node_convert($nid,
   cache_clear_all('node:'. $nid, 'cache_menu', 'TRUE');
   cache_clear_all('node/'. $nid, 'cache_menu', 'TRUE');
   if (module_exists('token')) {
-    token_get_values('global', NULL, TRUE);    
+    token_get_values('global', NULL, TRUE);
   }
 
   $converted_node = node_load($nid, NULL, TRUE);
@@ -722,7 +722,7 @@ function node_convert_field_convert($nid
     if (!empty($source_values)) {
       $source_values = array_values($source_values);
     } else {
-      $source_values[] = '';      
+      $source_values[] = '';
     }
     $source_values[] = $nid;
     $source_values[] = $vid;
@@ -759,8 +759,8 @@ function node_convert_field_convert($nid
           $node_body = $values;
           $node_teaser = $values;
         }
-        return; // We return because there's only a single value, and the rest are vid and nid -> unuseful.
-      } 
+        break; // We break because there's only a single value, and the rest are vid and nid -> unuseful.
+      }
     }
     return array('body' => $node_body, 'teaser' => $node_teaser);
   }