--- a/ValueModel.st	Fri Nov 11 17:21:32 2016 +0100
+++ b/ValueModel.st	Fri Nov 11 17:21:44 2016 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libview2' }"
 
+"{ NameSpace: Smalltalk }"
+
 Model subclass:#ValueModel
 	instanceVariableNames:''
 	classVariableNames:''
@@ -116,10 +118,11 @@
     |oldInterests wasDependent|
 
     [
-        oldInterests := self interestsFor:someOne.
-        self retractInterestsFor:someOne.
-        wasDependent := (self dependents includes:someOne).
-        self removeDependent:someOne.
+        oldInterests := self retractInterestsFor:someOne.
+        wasDependent := self dependents includes:someOne.
+        wasDependent ifTrue:[
+            self removeDependent:someOne.
+        ].
         
         self value:newValue.
     ] ensure:[
@@ -181,5 +184,6 @@
 !ValueModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ValueModel.st,v 1.33 2012-04-27 12:52:11 cg Exp $'
+    ^ '$Header$'
 ! !
+