--- a/JavaExceptionTableEntry.st	Sat Feb 02 01:23:18 2013 +0100
+++ b/JavaExceptionTableEntry.st	Sat Feb 16 19:08:45 2013 +0100
@@ -1,7 +1,10 @@
 "
  COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague (*)
+                            SWING Research Group, Czech Technical University in Prague
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -10,8 +13,10 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 
- (*) extensions, changes and fixes for java1.1 compatibility.
-     For a list of changes, see a list of diffs against the last stable version before 2011-08.
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
 "
 "{ Package: 'stx:libjava' }"
 
@@ -27,8 +32,11 @@
 copyright
 "
  COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague (*)
+                            SWING Research Group, Czech Technical University in Prague
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -37,8 +45,10 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 
- (*) extensions, changes and fixes for java1.1 compatibility.
-     For a list of changes, see a list of diffs against the last stable version before 2011-08.
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
 
 "
 ! !
@@ -132,21 +142,23 @@
         (catchType == 0) ifTrue:[^ handlerPC].
         (catchType isNil) ifTrue:[^ handlerPC].
         cls := aMethod javaClass.
-        catchType := catchType javaClass.
+        exception notNil ifTrue:[
+            catchType := catchType javaClass.
 
-        (catchType isKindOf:JavaClass) ifFalse:[
-            self halt.
+            (catchType isKindOf:JavaClass) ifFalse:[
+                self halt.
+                ^ nil
+            ].
+            (exception isKindOf:catchType) ifTrue:[
+                ^ handlerPC
+            ].
             ^ nil
-        ].
-        (exception isKindOf:catchType) ifTrue:[
-            ^ handlerPC
-        ].
-        ^ nil
+        ]
     ].
     ^ nil
 
     "Modified: / 07-01-1998 / 15:30:14 / cg"
-    "Modified: / 31-05-2011 / 09:53:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-09-2012 / 18:50:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 startPC:start_pc endPC:end_pc handlerPC:handler_pc catchType:catch_type
@@ -161,13 +173,19 @@
 !JavaExceptionTableEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaExceptionTableEntry.st,v 1.18 2011-11-24 11:52:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaExceptionTableEntry.st,v 1.19 2013-02-16 18:08:32 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaExceptionTableEntry.st,v 1.18 2011-11-24 11:52:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaExceptionTableEntry.st,v 1.19 2013-02-16 18:08:32 vrany Exp $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '§Id: JavaExceptionTableEntry.st,v 1.16 2011/08/18 18:42:48 vrany Exp §'
+    ^ '§Id§'
 ! !
+