diff --git a/src/main/java/org/olat/search/service/document/RepositoryEntryDocument.java b/src/main/java/org/olat/search/service/document/RepositoryEntryDocument.java
index e076faee6f0a62de00238339a3a1fb130ca70f82..400f93a4925f6f2ae994c419fbef295e28bda7ba 100644
--- a/src/main/java/org/olat/search/service/document/RepositoryEntryDocument.java
+++ b/src/main/java/org/olat/search/service/document/RepositoryEntryDocument.java
@@ -108,7 +108,6 @@ public class RepositoryEntryDocument extends OlatDocument {
 			icon = "o_ep_icon";
 		else {
 			icon = "o_sp_icon";
-			System.out.println("*********** Unkown doc type: " + docType);
 		}
 		return icon;
 	}
diff --git a/src/main/java/org/olat/search/service/document/WikiPageDocument.java b/src/main/java/org/olat/search/service/document/WikiPageDocument.java
index 377c6e8a431d3df7e791aee19f26eeda6646affa..fd1aa25ed72229184529361cd3a0a33066cabbd2 100644
--- a/src/main/java/org/olat/search/service/document/WikiPageDocument.java
+++ b/src/main/java/org/olat/search/service/document/WikiPageDocument.java
@@ -68,7 +68,9 @@ public class WikiPageDocument extends OlatDocument {
   	long userId = wikiPage.getInitalAuthor();
   	if (userId != 0) {
   		Identity  identity = identityManager.loadIdentityByKey(Long.valueOf(userId));
-			wikiPageDocument.setAuthor(identity.getName());
+  		if(identity != null) {
+  			wikiPageDocument.setAuthor(identity.getName());
+  		}
   	}
 		wikiPageDocument.setTitle(wikiPage.getPageName());
 		wikiPageDocument.setContent(getContent(wikiPage));