--- a/JavaContext.st	Tue Aug 12 03:51:19 1997 +0000
+++ b/JavaContext.st	Wed Aug 13 13:11:04 1997 +0000
@@ -11,6 +11,9 @@
 argsAndVars
     |nArgs nVars|
 
+    stack isNil ifTrue:[^ #()].
+    frameBase isNil ifTrue:[^ #()].
+
     nArgs := method numArgs.
     nVars := method numVars.
 
@@ -23,7 +26,7 @@
     ^ (stack copyFrom:(frameBase+1) to:(frameBase + nArgs + nVars)) asArray
 
     "Created: 1.5.1996 / 17:32:44 / cg"
-    "Modified: 1.5.1996 / 17:41:50 / cg"
+    "Modified: 12.8.1997 / 22:04:39 / cg"
 !
 
 canReturn
@@ -118,6 +121,7 @@
  'oops - negative stackFrame' errorPrintCR.
  ^ #()
 ].
+stack isNil ifTrue:[^ #()].
 
 "/ method displayString printCR.
 "/ frameBase print. ' ... ' print. (sp-1) printCR.
@@ -128,7 +132,7 @@
 "/    ].
     ^ stack copyFrom:frameBase to:(sp-1)
 
-    "Modified: 4.8.1997 / 23:39:38 / cg"
+    "Modified: 12.8.1997 / 21:55:47 / cg"
 ! !
 
 !JavaContext methodsFor:'accessing'!
@@ -247,5 +251,5 @@
 !JavaContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.15 1997/08/12 00:39:51 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.16 1997/08/13 13:11:04 cg Exp $'
 ! !