diff --git a/portal-impl/src/com/liferay/portlet/wiki/util/WikiNodeIndexer.java b/portal-impl/src/com/liferay/portlet/wiki/util/WikiNodeIndexer.java
index 225a5f986436e4d7bf9fb880fa3bf4facbd95909..03a3b1014b233c53e226c87ff7f59e18578b4aa0 100644
--- a/portal-impl/src/com/liferay/portlet/wiki/util/WikiNodeIndexer.java
+++ b/portal-impl/src/com/liferay/portlet/wiki/util/WikiNodeIndexer.java
@@ -20,6 +20,8 @@ import com.liferay.portal.kernel.dao.orm.Property;
 import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.search.BaseIndexer;
 import com.liferay.portal.kernel.search.Document;
 import com.liferay.portal.kernel.search.DocumentImpl;
@@ -32,6 +34,7 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants;
 import com.liferay.portal.security.permission.ActionKeys;
 import com.liferay.portal.security.permission.PermissionChecker;
 import com.liferay.portal.util.PortletKeys;
+import com.liferay.portlet.trash.util.TrashUtil;
 import com.liferay.portlet.wiki.model.WikiNode;
 import com.liferay.portlet.wiki.service.WikiNodeLocalServiceUtil;
 import com.liferay.portlet.wiki.service.permission.WikiNodePermission;
@@ -83,7 +86,7 @@ public class WikiNodeIndexer extends BaseIndexer {
 
 		Document document = new DocumentImpl();
 
-		document.addUID(PORTLET_ID, node.getNodeId(), node.getName());
+		document.addUID(PORTLET_ID, node.getNodeId());
 
 		SearchEngineUtil.deleteDocument(
 			getSearchEngineId(), node.getCompanyId(), document.get(Field.UID));
@@ -98,7 +101,14 @@ public class WikiNodeIndexer extends BaseIndexer {
 		document.addUID(PORTLET_ID, node.getNodeId(), node.getName());
 
 		document.addText(Field.DESCRIPTION, node.getDescription());
-		document.addText(Field.TITLE, node.getName());
+
+		String title = node.getName();
+
+		if (node.isInTrash()) {
+			title = TrashUtil.getOriginalTitle(title);
+		}
+
+		document.addText(Field.TITLE, title);
 
 		return document;
 	}
@@ -164,12 +174,21 @@ public class WikiNodeIndexer extends BaseIndexer {
 			}
 
 			@Override
-			protected void performAction(Object object) throws PortalException {
+			protected void performAction(Object object) {
 				WikiNode node = (WikiNode)object;
 
-				Document document = getDocument(node);
-
-				addDocument(document);
+				try {
+					Document document = getDocument(node);
+
+					addDocument(document);
+				}
+				catch (PortalException pe) {
+					if (_log.isWarnEnabled()) {
+						_log.warn(
+							"Unable to index wiki node " + node.getNodeId(),
+							pe);
+					}
+				}
 			}
 
 		};
@@ -180,4 +199,6 @@ public class WikiNodeIndexer extends BaseIndexer {
 		actionableDynamicQuery.performActions();
 	}
 
+	private static Log _log = LogFactoryUtil.getLog(WikiNodeIndexer.class);
+
 }
\ No newline at end of file
