diff -r 31a94b71ae1b -r f16aa0e8541e UIPainter.st
--- a/UIPainter.st	Wed Sep 10 10:36:23 1997 +0200
+++ b/UIPainter.st	Mon Sep 15 23:47:24 1997 +0200
@@ -3033,10 +3033,12 @@
     self multipleSelectOk:true.
 
     cvsEventsDisabled := false.
-    imageMasterChild  := (self class imageMasterChild) onDevice:device.
-    imageMasterParent := (self class imageMasterParent) onDevice:device.
-    imageEmptyParent  := (self class imageEmptyParent)  onDevice:device.
-
+    imageMasterChild  := self class imageMasterChild. 
+    imageMasterChild notNil ifTrue:[imageMasterChild := imageMasterChild onDevice:device].
+    imageMasterParent := self class imageMasterParent. 
+    imageMasterParent notNil ifTrue:[imageMasterParent := imageMasterParent onDevice:device].
+    imageEmptyParent  := self class imageEmptyParent.  
+    imageEmptyParent notNil ifTrue:[imageEmptyParent := imageEmptyParent onDevice:device].
 ! !
 
 !UIPainter::TreeView methodsFor:'private'!