diff -r 9eaad4dbe96d -r 694af148f557 src/ztfy/utils/catalog/index.py
--- a/src/ztfy/utils/catalog/index.py	Thu Oct 25 18:59:02 2012 +0200
+++ b/src/ztfy/utils/catalog/index.py	Wed Oct 31 14:19:43 2012 +0100
@@ -117,9 +117,9 @@
 
     def index_doc(self, docid, value):
         """See interface IInjection"""
+        self.unindex_doc(docid)
         v = self.interface(value, None)
         if v is not None:
-            self.unindex_doc(docid)
             self._index.index_object(v, docid)
 
     def unindex_doc(self, docid):