--- a/ExceptionHandlerSet.st	Fri Aug 13 21:30:22 2004 +0200
+++ b/ExceptionHandlerSet.st	Tue Aug 17 17:31:59 2004 +0200
@@ -113,20 +113,27 @@
 "
 ! !
 
-!ExceptionHandlerSet methodsFor:'adding'!
+!ExceptionHandlerSet methodsFor:'Compatibility-VW5.4'!
 
-on:aSignal do:aHandler
+on:aSignalOrException handle:aHandler
     "add a handler for aSignal to the set"
 
-    self at:aSignal put:aHandler
-!
+    self on:aSignalOrException do:aHandler
 
-on:aSignal handle:aHandler
+    "Created: / 26.7.1999 / 09:51:37 / stefan"
+! !
+
+!ExceptionHandlerSet methodsFor:'adding'!
+
+on:aSignalOrException do:aHandler
     "add a handler for aSignal to the set"
 
-    self at:aSignal put:aHandler
-
-    "Created: / 26.7.1999 / 09:51:37 / stefan"
+    aSignalOrException isBehavior ifTrue:[
+        aSignalOrException isLoaded ifFalse:[
+            aSignalOrException autoload.
+        ].
+    ].
+    self at:aSignalOrException put:aHandler
 ! !
 
 !ExceptionHandlerSet methodsFor:'queries'!
@@ -307,5 +314,5 @@
 !ExceptionHandlerSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExceptionHandlerSet.st,v 1.12 2004-04-06 13:32:21 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExceptionHandlerSet.st,v 1.13 2004-08-17 15:31:59 cg Exp $'
 ! !