Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 13467)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 13468)
@@ -708,6 +708,6 @@
                 Matcher m = Pattern.compile("(\\d+)\\.(\\d+)(\\.\\d+.*)?").matcher(version);
                 if (m.matches()) {
-                    int maj = Integer.valueOf(m.group(1));
-                    int min = Integer.valueOf(m.group(2));
+                    int maj = Integer.parseInt(m.group(1));
+                    int min = Integer.parseInt(m.group(2));
                     return (maj == 4 && min >= 5) || maj > 4;
                 }
@@ -726,5 +726,5 @@
     public static int getPowerShellVersion() {
         try {
-            return Integer.valueOf(Utils.execOutput(Arrays.asList(
+            return Integer.parseInt(Utils.execOutput(Arrays.asList(
                     "powershell", "-Command", "$PSVersionTable.PSVersion.Major"), 2, TimeUnit.SECONDS));
         } catch (NumberFormatException | IOException | ExecutionException | InterruptedException e) {
Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 13467)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 13468)
@@ -869,8 +869,5 @@
             }
             String msg = all != null ? all.toString() : null;
-            if (!p.waitFor(timeout, unit)) {
-                throw new ExecutionException(msg, null);
-            }
-            if (p.exitValue() != 0) {
+            if (!p.waitFor(timeout, unit) || p.exitValue() != 0) {
                 throw new ExecutionException(msg, null);
             }