Index: feedapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.module,v
retrieving revision 1.23.2.119.2.67
diff -u -p -r1.23.2.119.2.67 feedapi.module
--- feedapi.module	6 Jul 2009 14:50:12 -0000	1.23.2.119.2.67
+++ feedapi.module	4 Aug 2009 11:20:21 -0000
@@ -930,7 +930,8 @@ function _feedapi_update(&$node, $teaser
 
     // In that case this feed has never have feed data. Should be created then, this is not really an update
     if (!is_numeric($old_config->feed->nid)) {
-      $node->feed = _feedapi_build_feed_object($node->type, $node->feed->url);
+      $url = isset($node->feed->url) ? $node->feed->url : $node->feedapi['feedapi_url'];
+      $node->feed = _feedapi_build_feed_object($node->type, $url);
       _feedapi_insert($node, 'insert', $teaser, $page);
       return;
     }
@@ -1313,7 +1314,8 @@ function _feedapi_build_feed_object($nod
   $feed->processors = _feedapi_format_settings($node_type_settings, 'processors');
   $feed->parsers = _feedapi_format_settings($node_type_settings, 'parsers');
   if (isset($feed->url)) {
-    $feed = _feedapi_call_parsers($feed, $feed->parsers, $node_type_settings['parsers']);
+    $parser_result = _feedapi_call_parsers($feed, $feed->parsers, $node_type_settings['parsers']);
+    $feed = is_object($parser_result) ? $parser_result : $feed;
   }
   $feed->link = isset($feed->options->link) ? $feed->options->link : '';
   return $feed;