diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/SystemProperties.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/SystemProperties.kt
index b003aa9f..898f0594 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/SystemProperties.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/SystemProperties.kt
@@ -2,8 +2,10 @@ package com.beust.kobalt
 
 class SystemProperties {
     companion object {
-        val javaBase = System.getProperty("java.home") ?:
-                (System.getenv("JAVA_HOME") ?: throw IllegalArgumentException("JAVA_HOME not defined"))
+        val javaBase =
+                System.getenv("JAVA_HOME")
+                ?: System.getProperty("java.home")
+                ?: throw IllegalArgumentException("JAVA_HOME not defined")
         val javaVersion = System.getProperty("java.version")
         val homeDir = System.getProperty("user.home")
         val tmpDir = System.getProperty("java.io.tmpdir")