--- a/src/common/tags.h	Wed Feb 13 09:55:15 2008 -0500
+++ b/src/common/tags.h	Thu Feb 14 17:48:15 2008 +0000
@@ -128,7 +128,15 @@
   // input to this function is not a subclass of the Tag class.
   parent = &tag;
   NS_ASSERT (sizeof (T) <= Tags::SIZE);
-  return Remove (T::GetUid ());
+  if (Peek (tag))
+    {
+      Remove (T::GetUid ());
+      return true;
+    }
+  else
+    {
+      return false;
+    }
 }
 
 template <typename T>