Index: Tomboy/Watchers.cs
===================================================================
--- Tomboy/Watchers.cs	(révision 2318)
+++ Tomboy/Watchers.cs	(copie de travail)
@@ -717,7 +717,24 @@
 
 		void DoHighlight (TrieHit hit, Gtk.TextIter start, Gtk.TextIter end)
 		{
+			
+			if (hit.Value == null) {
+				Logger.Log ("DoHightLight: null pointeur error for '{0}'." , hit.Key);
+				return;
+			}
+			
+			if (Manager.Find(hit.Key) == null) {
+				Logger.Log ("DoHightLight: '{0}' links to non-existing note." , hit.Key);
+				return;
+			}
+			
 			Note hit_note = (Note) hit.Value;
+
+			if (String.Compare(hit.Key.ToString(), hit_note.Title.ToString(), true ) != 0) { // == 0 if same string  
+				Logger.Log ("DoHightLight: '{0}' links wrongly to note '{1}'." , hit.Key, hit_note.Title);
+				return;
+			}
+			
 			if (hit_note == this.Note)
 				return;
 
@@ -736,8 +753,9 @@
 			if (title_start.HasTag (url_tag))
 				return;
 
-			Logger.Log ("Matching Note title '{0}' at {1}-{2}...",
-			            hit.Key,
+			Logger.Log ("Matching Note title '{0}' by '{1}' at {2}-{3}.",
+			            hit_note.Title,
+			            hit.Key,		                
 			            hit.Start,
 			            hit.End);
 
