diff --git a/plugins/search2/reporting/IndexingStatus.php b/plugins/search2/reporting/IndexingStatus.php
index 4839a78..14d3ad9 100644
--- a/plugins/search2/reporting/IndexingStatus.php
+++ b/plugins/search2/reporting/IndexingStatus.php
@@ -89,12 +89,8 @@ class IndexingStatusDispatcher extends KTAdminDispatcher
         // ---------------------------
 
         // Do a run time check for extractors not working
-        Indexer::updateIndexStats();
-
-        // Get Results
-        $extractorDiagnosis = KTUtil::getSystemSetting('extractorDiagnostics');
-
-        if (!empty($extractorDiagnosis)) $extractorDiagnosis = unserialize($extractorDiagnosis);
+        $indexer = Indexer::get();
+        $extractorDiagnosis = $indexer->diagnoseExtractors();
 
         // Create an Array to store errors
         $this->extractorErrors = array();
diff --git a/plugins/search2/reporting/LuceneStatistics.php b/plugins/search2/reporting/LuceneStatistics.php
index 51f1157..1764afb 100644
--- a/plugins/search2/reporting/LuceneStatistics.php
+++ b/plugins/search2/reporting/LuceneStatistics.php
@@ -38,6 +38,7 @@
 
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
+require_once(KT_DIR . '/search2/indexing/indexerCore.inc.php');
 
 class LuceneStatisticsDispatcher extends KTAdminDispatcher
 {
@@ -46,19 +47,18 @@ class LuceneStatisticsDispatcher extends KTAdminDispatcher
     */
     function do_main() {
         $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _kt('Document Indexer Statistics'));
-        
-        $stats = KTUtil::getSystemSetting('indexerStats');
-        
-        $this->stats = unserialize($stats);
+
+        $indexer = Indexer::get();
+        $stats = $indexer->getIndexStatistics();
 
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate('ktcore/search2/lucene_statistics');
-    
+
         $aTemplateData = array(
                 'context' => $this,
-                'stats'=>$this->stats
+                'stats' => $stats
             );
-    
+
         return $oTemplate->render($aTemplateData);
     }
 }
diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php
index b504b8f..7e1efaf 100755
--- a/search2/indexing/indexerCore.inc.php
+++ b/search2/indexing/indexerCore.inc.php
@@ -410,7 +410,7 @@ class FolderShortcutResultItem extends ProxyResultItem
     var $parentId;
     var $linkedId;
     var $full_path;
-    
+
     public function getFolderID() { return $this->getId(); }
     public function getMimeIconPath() { return 'folder_shortcut'; }
 
@@ -759,6 +759,11 @@ abstract class Indexer
     {
     	$content = file_get_contents($filename);
 
+    	// if the file is empty something went wrong with the text extraction
+    	if(empty($content)){
+    	    return false;
+    	}
+
     	$src = array("([\r\n])","([\n][\n])","([\n])","([\t])",'([ ][ ])');
     	$tgt = array("\n","\n",' ',' ',' ');
 
@@ -1057,7 +1062,7 @@ abstract class Indexer
 		return Indexer::getIndexingQueue(false);
 	}
 
-	public function updateIndexStats()
+	public function getIndexStatistics()
 	{
 	    $optimisationDate = KTUtil::getSystemSetting('luceneOptimisationDate', '');
 
@@ -1139,14 +1144,18 @@ abstract class Indexer
 	    'noOptimisation'=>$noOptimisation
 	    );
 
-	    KTUtil::setSystemSetting('indexerStats', serialize($stats));
+	    return $stats;
+	}
 
-	    $indexer = Indexer::get();
+	public function updateIndexStats()
+	{
+	    $stats = $this->getIndexStatistics();
+	    KTUtil::setSystemSetting('indexerStats', serialize($stats));
 
-	    $diagnosis = $indexer->diagnose();
+	    $diagnosis = $this->diagnose();
 	    KTUtil::setSystemSetting('indexerDiagnostics', serialize($diagnosis));
 
-	    $extractorDiagnosis = $indexer->diagnoseExtractors();
+	    $extractorDiagnosis = $this->diagnoseExtractors();
 
 	    KTUtil::setSystemSetting('extractorDiagnostics', serialize($extractorDiagnosis));
 	}
@@ -1321,7 +1330,7 @@ abstract class Indexer
 	        Indexer::unqueueDocument($docId,sprintf(_kt("indexDocuments: Filename for document id %d starts with a tilde (~). This is assumed to be a temporary file. This is ignored."),$docId), 'error');
 	        return ;
 	    }
-        
+
 	    $removeFromQueue = true;
 	    if ($indexDocument)
 	    {