--- a/WeakArray.st	Sat Jul 18 01:32:40 2015 +0200
+++ b/WeakArray.st	Sat Jul 18 12:05:38 2015 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 ArrayedCollection variableSubclass:#WeakArray
 	instanceVariableNames:'dependents'
 	classVariableNames:'RegistrationFailedSignal AlreadyInitialized'
@@ -123,9 +125,9 @@
 
     self flags:(Behavior flagWeakPointers).     "/ read the comment in basicNew:
     RegistrationFailedSignal isNil ifTrue:[
-        RegistrationFailedSignal := Error newSignalMayProceed:true.
-        RegistrationFailedSignal nameClass:self message:#registrationFailedSignal.
-        RegistrationFailedSignal notifierString:'weakArray registration failed'.
+	RegistrationFailedSignal := Error newSignalMayProceed:true.
+	RegistrationFailedSignal nameClass:self message:#registrationFailedSignal.
+	RegistrationFailedSignal notifierString:'weakArray registration failed'.
     ].
 ! !
 
@@ -275,7 +277,7 @@
     |el|
 
     el := self basicAt:index.
-    el == 0 ifTrue:[
+    el class == SmallInteger ifTrue:[
 	^ exeptionalValue value
     ].
     ^ el
@@ -652,7 +654,7 @@
      slots may change iff the garbage collector finds new garbage."
 
     self keysAndValuesDo:[:index :element |
-	element == 0 ifTrue:[
+	element class == SmallInteger ifTrue:[
 	     aBlock value:index
 	]
     ]
@@ -671,7 +673,7 @@
      slots may change iff the garbage collector finds new garbage."
 
     self keysAndValuesDo:[:index :element |
-	element == 0 ifTrue:[
+	element class == SmallInteger ifTrue:[
 	    self at:index put:newValue.
 	    aBlock value:index.
 	]
@@ -1027,11 +1029,11 @@
 !WeakArray class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/WeakArray.st,v 1.70 2014-05-06 14:45:50 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/WeakArray.st,v 1.70 2014-05-06 14:45:50 cg Exp $'
+    ^ '$Header$'
 ! !