--- a/js/src/xpconnect/src/xpcwrappedjsclass.cpp
+++ b/js/src/xpconnect/src/xpcwrappedjsclass.cpp
@@ -1300,24 +1300,23 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWra
         cx = ccx.GetJSContext();
     }
     else
     {
         xpcc = nsnull;
         cx = nsnull;
     }
 
+    AutoScriptEvaluate scriptEval(cx);
     js::AutoValueVector args(cx);
-    /* This must come before AutoScriptEvaluate */
-    JSAutoEnterCompartment ac;
-    AutoScriptEvaluate scriptEval(cx);
     ContextPrincipalGuard principalGuard(ccx);
 
     obj = thisObj = wrapper->GetJSObject();
 
+    JSAutoEnterCompartment ac;
     if (!ac.enter(ccx, obj))
         goto pre_call_clean_up;
 
     // XXX ASSUMES that retval is last arg. The xpidl compiler ensures this.
     paramCount = info->num_args;
     argc = paramCount -
         (paramCount && XPT_PD_IS_RETVAL(info->params[paramCount-1].flags) ? 1 : 0);