--- a/Block.st	Thu Oct 22 19:35:02 2009 +0200
+++ b/Block.st	Thu Oct 22 19:47:05 2009 +0200
@@ -485,7 +485,7 @@
 
     |numArgs|
 
-    numArgs := handlerBlock numArgs.
+    numArgs := handlerBlock isBlock ifTrue:[handlerBlock numArgs] ifFalse:[0].
     numArgs == 1 ifTrue:[
         ^ self on:Error do:handlerBlock
     ].
@@ -547,7 +547,6 @@
     "Created: 15.11.1996 / 11:38:37 / cg"
 ! !
 
-
 !Block methodsFor:'accessing'!
 
 home
@@ -2885,11 +2884,11 @@
 !Block class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.172 2009-10-04 15:44:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.173 2009-10-22 17:47:05 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.172 2009-10-04 15:44:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.173 2009-10-22 17:47:05 cg Exp $'
 ! !
 
 Block initialize!