diff --git a/lib/templating/smartytemplate.inc.php b/lib/templating/smartytemplate.inc.php
index 8ed70f0..34dadcc 100644
--- a/lib/templating/smartytemplate.inc.php
+++ b/lib/templating/smartytemplate.inc.php
@@ -7,32 +7,32 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2007 The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  */
 
@@ -95,9 +95,12 @@ class KTSmartyTemplate extends KTTemplate {
         }
         else
         {
-			$search2_quick=1;
+			$search2_quick=0;
 			$search2_general=1;
 			$search2_quickQuery = _kt('Enter search criteria');
+			$_SESSION['search2_quick'] = $search2_quick;
+			$_SESSION['search2_general'] = $search2_general;
+			$_SESSION['search2_quickQuery'] = '';
         }
 
         $smarty->assign('search2_quick', $search2_quick);
diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php
index 7017c85..72c75ef 100644
--- a/search2/indexing/indexerCore.inc.php
+++ b/search2/indexing/indexerCore.inc.php
@@ -95,6 +95,7 @@ class QueryResultItem
 
 	public function loadDocumentInfo()
 	{
+		global $default;
 		$sql = "SELECT
 					d.folder_id, f.full_path, f.name, dcv.size as filesize, dcv.major_version,
 					dcv.minor_version, dcv.filename, cou.name as checkoutuser, w.human_name as workflow, ws.human_name as workflowstate,
@@ -121,7 +122,16 @@ class QueryResultItem
 		if (PEAR::isError($result) || empty($result))
 		{
 			$this->live = false;
-			throw new Exception('QueryResultItem::loadDocumentInfo failed');
+			if (PEAR::isError($result))
+			{
+				throw new Exception('Database exception! There appears to be an error in the system: ' .$result->getMessage());
+			}
+
+			$default->log->error('QueryResultItem: $result is null');
+			$msg = 'The database did not have a record matching the result from the document indexer. This may occur if there is an inconsistency between the document indexer and the repository. The indexer needs to be repaired. Please consult the administrator guide as to how to repair your indexer.';
+			$default->log->error('QueryResultItem: ' . $msg);
+			// TODO: repair process where we scan documents in index, and delete those for which there is nothing in the repository
+			throw new Exception(_kt($msg));
 		}
 
 		if (is_null($result['name']))