--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	Wed Dec 05 17:05:42 2018 -0500
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	Thu Dec 06 16:45:26 2018 -0500
@@ -382,7 +382,7 @@
 
         WIN_REGISTRY_NAME ("win-registry-name", OptionCategories.PLATFORM_WIN),
 
-        WIN_MSI_UPGRADE_UUID ("win-upgrade-uuid",
+        WIN_UPGRADE_UUID ("win-upgrade-uuid",
                 OptionCategories.PLATFORM_WIN),
 
         WIN_CONSOLE_HINT ("win-console", OptionCategories.PLATFORM_WIN, () -> {
@@ -664,7 +664,7 @@
                 throw new PackagerException("ERR_NoJreInstallerName");
             }
 
-            generateBundle(bp.getBundleParamsAsMap());
+            return generateBundle(bp.getBundleParamsAsMap());
         } catch (Exception e) {
             if (Log.isVerbose()) {
                 throw e;
@@ -676,7 +676,6 @@
                 return false;
             }
         }
-        return true;
     }
 
     private void validateArguments() {
@@ -713,8 +712,10 @@
         return platformBundlers;
     }
 
-    private void generateBundle(Map<String,? super Object> params)
+    private boolean generateBundle(Map<String,? super Object> params)
             throws PackagerException {
+        boolean bundleCreated = false;
+
         for (jdk.jpackage.internal.Bundler bundler : getPlatformBundlers()) {
             Map<String, ? super Object> localParams = new HashMap<>(params);
             try {
@@ -726,6 +727,7 @@
                         throw new PackagerException("MSG_BundlerFailed",
                                 bundler.getID(), bundler.getName());
                     }
+                    bundleCreated = true; // Set that at least one bundle was created
                 }
             } catch (UnsupportedPlatformException e) {
                 Log.debug(MessageFormat.format(
@@ -749,6 +751,8 @@
                 Log.debug(re);
             }
         }
+
+        return bundleCreated;
     }
 
     private void addResources(DeployParams deployParams,