diff --git a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
index 3609d04ee15..339e44dff61 100644
--- a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
+++ b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
@@ -374,13 +374,6 @@ InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *arg
     }
 
 
-    // save callback function if any (ignore bad args for now)
-    if ( argc >= 2 && JS_TypeOfValue(cx,argv[1]) == JSTYPE_FUNCTION )
-    {
-        trigger->SaveCallback( cx, argv[1] );
-    }
-
-
     // pass on only if good stuff found
     if (!abortLoad && trigger->Size() > 0)
     {
@@ -407,6 +400,12 @@ InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *arg
                 }
                 else
                 {
+                    // save callback function if any (ignore bad args for now)
+                    if ( argc >= 2 && JS_TypeOfValue(cx,argv[1]) == JSTYPE_FUNCTION )
+                    {
+                        trigger->SaveCallback( cx, argv[1] );
+                    }
+
                     PRBool result;
                     nativeThis->StartInstall(installInfo, &result);
                     *rval = BOOLEAN_TO_JSVAL(result);
diff --git a/mozilla/xpinstall/src/nsXPIInstallInfo.h b/mozilla/xpinstall/src/nsXPIInstallInfo.h
index 5caa47feb30..d1f299deb7f 100644
--- a/mozilla/xpinstall/src/nsXPIInstallInfo.h
+++ b/mozilla/xpinstall/src/nsXPIInstallInfo.h
@@ -55,8 +55,8 @@ public:
 private:
   ~nsXPIInstallInfo();
   
-  nsXPITriggerInfo* mTriggerInfo;
   nsCOMPtr<nsIDOMWindowInternal> mOriginatingWindow;
   nsCOMPtr<nsIURI> mOriginatingURI;
+  nsXPITriggerInfo* mTriggerInfo;
   PRUint32 mChromeType;
 };