diff --git a/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java b/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
index 360de7842..99cfba378 100644
--- a/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
+++ b/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
@@ -352,9 +352,16 @@ public class AlfrescoSolrHighlighter extends DefaultSolrHighlighter implements P
 		if (highlightFieldEntry.getValue() instanceof String[])
 		{
 			String [] snippets = (String[])highlightFieldEntry.getValue();
-			if (snippets.length > 0)
+			if (snippets != null && snippets.length > 0 && snippets[0] != null)
 			{
-				snippets[0] = snippets[0].charAt(3) == '\u0000' ? snippets[0].substring(4) : snippets[0].substring(5);
+                if (snippets[0].charAt(0) == '\u0000')
+                {
+                    int pos = snippets[0].indexOf('\u0000',1);
+                    if(pos != -1)
+                    {
+                        snippets[0] = snippets[0].substring(pos + 1);
+                    }
+                }
 			}
 		}
 	}