Index: apachesolr.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.admin.inc,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 apachesolr.admin.inc
--- apachesolr.admin.inc	17 Feb 2009 11:20:21 -0000	1.1.2.7
+++ apachesolr.admin.inc	17 Feb 2009 16:45:44 -0000
@@ -83,11 +83,17 @@ function apachesolr_index_page() {
 
   $output  = '';
   if (isset($data->index->numDocs)) {
-    $stats = $solr->getStats(true);
-    $docsPendingXpath = $stats->xpath('//stat[@name="docsPending"]');
-    $pending_docs = (int)(string)$docsPendingXpath[0];
-    $pending_msg = $pending_docs ? t('(@pending_docs sent but not yet indexed)', array('@pending_docs' => $pending_docs)) : '';
-    $output .= '<p>' . t('Number of documents in index: @num @pending', array('@num' => $data->index->numDocs, '@pending' => $pending_msg)) . "</p>\n";
+    $pending_docs = '';
+    try {
+      $stats = $solr->getStats(TRUE);
+      $docsPendingXpath = $stats->xpath('//stat[@name="docsPending"]');
+      $pending_docs = trim($docsPendingXpath[0]);
+    }
+    catch (Exception $e) {
+      watchdog('apachesolr', $e->getMessage());
+    }
+    $pending_msg = $pending_docs ? t('(@pending_docs sent but not yet processed)', array('@pending_docs' => $pending_docs)) : '';
+    $output .= '<p>' . t('Number of documents in index: @num !pending', array('@num' => $data->index->numDocs, '!pending' => $pending_msg)) . "</p>\n";
     $output .= '<p>' . t('Number of terms in index: @num', array('@num' => $data->index->numTerms)) . "</p>\n";
   }
 
Index: apachesolr_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.module,v
retrieving revision 1.1.2.6.2.69
diff -u -p -r1.1.2.6.2.69 apachesolr_search.module
--- apachesolr_search.module	17 Feb 2009 16:07:56 -0000	1.1.2.6.2.69
+++ apachesolr_search.module	17 Feb 2009 16:45:44 -0000
@@ -20,7 +20,7 @@ function apachesolr_search_help($section
       $remaining += $status['remaining'];
       $total += $status['total'];
 
-      return t('The Apache Solr search index is generated by !cron. %percentage of the site has been indexed. There @items left to index.', array(
+      return t('The search index is generated by !cron. %percentage of the site content has been sent to the server. There @items left to send.', array(
         '!cron' => l(t('running cron'), 'admin/reports/status/run-cron', array('query' => array('destination' => 'admin/settings/apachesolr/index'))),
         '%percentage' => ((int)min(100, 100 * ($total - $remaining) / max(1, $total))) .'%',
         '@items' => format_plural($remaining, t('is 1 item'), t('are @count items')