diff --git a/tools/package-client.js b/tools/package-client.js
index 58c8c82ca2..995c65e21b 100644
--- a/tools/package-client.js
+++ b/tools/package-client.js
@@ -427,6 +427,13 @@ exports.bundleBuild = bundleBuild;
 var createAndPublishBuiltPackage = function (conn, unipackage) {
   buildmessage.assertInJob();
 
+  // Note: we really want to do this before createPackageBuild, because the URL
+  // we get from createPackageBuild will expire!
+  process.stdout.write('Bundling build...\n');
+  var bundleResult = bundleBuild(unipackage);
+  if (buildmessage.jobHasMessages())
+    return;
+
   process.stdout.write('Creating package build...\n');
   var uploadInfo = conn.call('createPackageBuild', {
     packageName: unipackage.name,
@@ -434,10 +441,6 @@ var createAndPublishBuiltPackage = function (conn, unipackage) {
     buildArchitectures: unipackage.buildArchitectures()
   });
 
-  var bundleResult = bundleBuild(unipackage);
-  if (buildmessage.jobHasMessages())
-    return;
-
   process.stdout.write('Uploading build...\n');
   uploadTarball(uploadInfo.uploadUrl,
                 bundleResult.buildTarball);