diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c55702484bcf72a4a050c14044ba513c038a5f96..d1e4242cc0ab091015a0482a02d781977f58ba5b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
 Feeds 6.x 1.0 XXXXXXXXXXXXXXXXXX
 --------------------------------
 
+- #885724 eliotttf: Avoid array_flip() on non scalars.
 - #885052 Hanno: Fix small typo in access rights.
 - #863494 ekes, alex_b: Delete temporary enclosures file.
 - #849986 lyricnz, alex_b: Cleaner batch support.
diff --git a/feeds.module b/feeds.module
index 7292080f553ffbcb53c51704e5331d9c65751b18..386d221ccbc86dfcbf6ca68dad293889deec1aba 100644
--- a/feeds.module
+++ b/feeds.module
@@ -513,7 +513,7 @@ function _feeds_importer_digest() {
     else {
       $importers = array();
       foreach (feeds_importer_load_all() as $importer) {
-        $importers[$importer->id] = $importer->config['content_type'];
+        $importers[$importer->id] = isset($importer->config['content_type']) ? $importer->config['content_type'] : '';
       }
       cache_set(__FUNCTION__, $importers);
     }