--- a/JavaFieldref.st	Tue Nov 10 00:17:42 1998 +0000
+++ b/JavaFieldref.st	Tue Nov 10 00:21:53 1998 +0000
@@ -87,13 +87,15 @@
 
     class isUnresolved ifTrue:[
         self halt:'unresolved class'.
+        ^ nil.
     ].
 
     self resolveType.
     nm := nameandType name asSymbol.
     offset := class instVarOffsetOf:nm.
+    ^ offset
 
-    "Modified: / 10.1.1998 / 11:50:06 / cg"
+    "Modified: / 9.11.1998 / 23:00:48 / cg"
 !
 
 resolveStatic
@@ -103,13 +105,15 @@
     cls ~~ class ifTrue:[
         class := cls.
     ].
+    class isNil ifTrue:[^ nil].
 
     self resolveType.
     nm := nameandType name asSymbol.
     offset := class class instVarOffsetOf:nm.
+    ^ offset
 
     "Created: / 2.1.1998 / 17:16:55 / cg"
-    "Modified: / 10.1.1998 / 11:50:45 / cg"
+    "Modified: / 9.11.1998 / 23:01:10 / cg"
 !
 
 resolveType
@@ -153,7 +157,7 @@
 !JavaFieldref class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaFieldref.st,v 1.18 1998/11/05 19:14:42 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaFieldref.st,v 1.19 1998/11/10 00:18:07 cg Exp $'
 
 ! !
 JavaFieldref initialize!