diff --git a/mozilla/js/src/jsinterp.c b/mozilla/js/src/jsinterp.c
index 03d9477d586..0e92d6f76c1 100644
--- a/mozilla/js/src/jsinterp.c
+++ b/mozilla/js/src/jsinterp.c
@@ -1576,9 +1576,11 @@ js_Interpret(JSContext *cx, jsval *result)
 
           case JSOP_TOOBJECT:
             SAVE_SP(fp);
-            ok = js_ValueToObject(cx, FETCH_OPND(-1), &obj);
-            if (!ok)
+            obj = js_ValueToNonNullObject(cx, FETCH_OPND(-1));
+            if (!obj) {
+                ok = JS_FALSE;
                 goto out;
+            }
             STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
             break;