diff --git a/mozilla/js/src/liveconnect/jsj_JavaPackage.c b/mozilla/js/src/liveconnect/jsj_JavaPackage.c
index 5c6b3f36cf9..d164c81fda6 100644
--- a/mozilla/js/src/liveconnect/jsj_JavaPackage.c
+++ b/mozilla/js/src/liveconnect/jsj_JavaPackage.c
@@ -165,8 +165,10 @@ JavaPackage_resolve(JSContext *cx, JSObject *obj, jsval id)
     }
 
     jsj_env = jsj_EnterJava(cx, &jEnv);
-    if (!jEnv)
-        return JS_FALSE;
+    if (!jEnv) {
+        ok = JS_FALSE;
+        goto out;
+    }
 
     /*
         Unfortunately, Java provides no way to find out whether a particular