--- a/src/jdk.jpackager/share/classes/jdk/jpackager/internal/DeployParams.java	Thu Nov 08 13:46:28 2018 -0500
+++ b/src/jdk.jpackager/share/classes/jdk/jpackager/internal/DeployParams.java	Thu Nov 08 13:56:26 2018 -0500
@@ -341,6 +341,22 @@
             throw new PackagerException("ERR_MissingArgument", "--output");
         }
 
+        if (getBundleType() == BundlerType.IMAGE) {
+            String input = (String)bundlerArguments.get(Arguments.CLIOptions.INPUT.getId());
+            if (input == null) {
+                throw new PackagerException("ERR_MissingArgument", "--input");
+            }
+        } else if (getBundleType() == BundlerType.INSTALLER) {
+            if (!Arguments.isJreInstaller()) {
+                String input = (String)bundlerArguments.get(Arguments.CLIOptions.INPUT.getId());
+                String appImage = (String)bundlerArguments.get(
+                    Arguments.CLIOptions.PREDEFINED_APP_IMAGE.getId());
+                if (input == null && appImage == null) {
+                    throw new PackagerException("ERR_MissingArgument", "--input or --app-image");
+                }
+            }
+        }
+
         boolean hasModule = (bundlerArguments.get(
                 Arguments.CLIOptions.MODULE.getId()) != null);
         boolean hasImage = (bundlerArguments.get(