--- a/states.py	Thu Jul 07 13:42:47 2011 +0200
+++ b/states.py	Fri Jul 08 18:42:28 2011 +0200
@@ -400,7 +400,8 @@
 
         def _tag(self, names, node, *args, **kwargs):
             tagnode = o_tag(names, node, *args, **kwargs)
-            self.setstate(ST0, [node, tagnode])
+            if tagnode is not None: # do nothing for local one
+                self.setstate(ST0, [node, tagnode])
             return tagnode
 
         ### rollback support