diff --git a/includes/FeedsImporter.inc b/includes/FeedsImporter.inc
index 19861053f3f86aa67b3dc0e38df061e6e1ad73b5..a4c6f7a068319a1b085ee72ef8e6b735fb8c3dd0 100644
--- a/includes/FeedsImporter.inc
+++ b/includes/FeedsImporter.inc
@@ -98,16 +98,13 @@ class FeedsImporter extends FeedsConfigurable {
    *   Throws Exception if an error occurs working off the job.
    */
   public function work($job) {
-    if ($this->export_type == FEEDS_EXPORT_NONE) {
-      return;
-    }
     switch ($job['callback']) {
       case 'import':
         return feeds_source($job['id'], $job['feed_nid'])->import();
-        break;
       case 'expire':
         return $this->expire();
     }
+    return FEEDS_BATCH_COMPLETE;
   }
 
   /**
diff --git a/includes/FeedsScheduler.inc b/includes/FeedsScheduler.inc
index 7adebec5261a22d19dcb2779a5567e0a0eeb38ba..e05c6298af0e27a0fa215de673fbb0d03ce4db4e 100644
--- a/includes/FeedsScheduler.inc
+++ b/includes/FeedsScheduler.inc
@@ -159,7 +159,7 @@ class FeedsScheduler implements FeedsSchedulerInterface {
   public function work($job) {
     $importer = feeds_importer($job['id']);
     try {
-      if (FEEDS_BATCH_COMPLETE == $importer->work($job)) {
+      if (FEEDS_BATCH_COMPLETE == $importer->existing()->work($job)) {
         $this->finished($job);
       }
     }