modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/Main.java

@@ -118,18 +118,16 @@
         properties.load(in);
         in.close();
 
         List<Param> parameters = new ArrayList<>(properties.size());
 
-        if (properties != null) {
             for (Map.Entry en : properties.entrySet()) {
                 Param p = new Param();
                 p.setName((String)en.getKey());
                 p.setValue((String)en.getValue());
                 parameters.add(p);
             }
-        }
         return parameters;
     }
 
     private static List<HtmlParam> parseHtmlParams(String filename) throws IOException {
         File paramFile = new File(filename);

@@ -138,18 +136,16 @@
         properties.load(in);
         in.close();
 
         List<HtmlParam> parameters = new ArrayList<>(properties.size());
 
-        if (properties != null) {
             for (Map.Entry en : properties.entrySet()) {
                 HtmlParam p = new HtmlParam();
                 p.setName((String)en.getKey());
                 p.setValue((String)en.getValue());
                 parameters.add(p);
             }
-        }
         return parameters;
     }
 
     private static List<JSCallback> parseCallbacks(String param) {
         String[] callbacks = param.split(",");

@@ -163,11 +159,11 @@
         }
         return list;
     }
 
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String... args) throws Exception {
         if (args.length == 0 || args.length == 1 && args[0].equals("-help")) {
             System.out.println(help);
         } else if (args.length == 1 && args[0].equals("-version")) {
             System.out.println(version);
         } else {

@@ -462,10 +458,13 @@
             } catch (Exception e) {
                 if (verbose) {
                     throw e;
                 } else {
                     System.err.println(e.getMessage());
+                    if (e.getCause() != null && e.getCause() != e) {
+                        System.err.println(e.getCause().getMessage());
+                    }
                     System.exit(-1);
                 }
             }
         }
     }