@@ -435,7 +435,8 @@ def index():
435435 if 'content' in result and result['content']:
436436 result['content'] = highlight_content(escape(result['content'][:1024]),
437437 search_query.query.encode('utf-8'))
438− result['title'] = highlight_content(escape(result['title']), search_query.query.encode('utf-8'))
438+ result['title'] = highlight_content(escape(result['title'] or u''),
439+ search_query.query.encode('utf-8'))
439440 else:
440441 if result.get('content'):
441442 result['content'] = html_to_text(result['content']).strip()