diff --git a/feeds.module b/feeds.module
index 8785f22..289f88a 100644
--- a/feeds.module
+++ b/feeds.module
@@ -506,7 +506,9 @@ function feeds_node_validate($node, $form, &$form_state) {
   // Node module magically moved $form['feeds'] to $node->feeds :P.
   // configFormValidate may modify $last_feed, smuggle it to update/insert stage
   // through a static variable.
-  $last_feeds = $node->feeds;
+  if (!empty($node->feeds)){
+    $last_feeds = $node->feeds;
+  }
   $source->configFormValidate($last_feeds);
 
   // If node title is empty, try to retrieve title from feed.
@@ -564,7 +566,7 @@ function feeds_node_insert($node) {
  */
 function feeds_node_update($node) {
   // Source attached to node.
-  if ($importer_id = feeds_get_importer_id($node->type)) {
+  if (!empty($node->feeds) && $importer_id = feeds_get_importer_id($node->type)) {
     $source = feeds_source($importer_id, $node->nid);
     $source->addConfig($node->feeds);
     $source->save();
@@ -594,18 +596,24 @@ function feeds_form_node_form_alter(&$form, $form_state) {
       $form['title']['#required'] = FALSE;
     }
 
-    // Enable uploads.
-    $form['#attributes']['enctype'] = 'multipart/form-data';
-
     // Build form.
     $source = feeds_source($importer_id, empty($form['#node']->nid) ? 0 : $form['#node']->nid);
-    $form['feeds'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Feed'),
-      '#tree' => TRUE,
-      '#weight' => 0,
-    );
-    $form['feeds'] += $source->configForm($form_state);
+    $source_form = $source->configForm($form_state);
+
+    if (!empty($source_form)) {
+      $form['feeds'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Feed'),
+        '#tree' => TRUE,
+        '#weight' => 0,
+      );
+      $form['feeds'] += $source_form;
+
+      // Enable uploads.
+      $form['#attributes']['enctype'] = 'multipart/form-data';
+    }
+
+
     $form['#feed_id'] = $importer_id;
   }
 }