--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java	Fri Nov 01 10:22:49 2019 -0400
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java	Fri Nov 01 10:25:15 2019 -0400
@@ -114,7 +114,7 @@
                 })::validate;
     }
 
-    private final static String MINIMAL_VERSION = "3.0";
+    private final static DottedVersion MINIMAL_VERSION = DottedVersion.lazy("3.0");
 
     static Path getSystemDir(String envVar, String knownDir) {
         return Optional
@@ -132,7 +132,6 @@
             } catch (InvalidPathException ex) {
                 Log.error(MessageFormat.format(I18N.getString(
                         "error.invalid-envvar"), envVar));
-                return null;
             }
         }
         return null;
@@ -142,9 +141,9 @@
         PathMatcher wixInstallDirMatcher = FileSystems.getDefault().getPathMatcher(
                 "glob:WiX Toolset v*");
 
-        Path programFiles = getSystemDir("ProgramFiles", "Program Files");
-        Path programFilesX86 = getSystemDir("ProgramFiles(X86)",
-                "Program Files (x86)");
+        Path programFiles = getSystemDir("ProgramFiles", "\\Program Files");
+        Path programFilesX86 = getSystemDir("ProgramFiles(x86)",
+                "\\Program Files (x86)");
 
         // Returns list of WiX install directories ordered by WiX version number.
         // Newer versions go first.