diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
index 8a5d7631cb94..bac9dd1a3951 100644
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -318,10 +318,8 @@ public class JavaSdkImpl extends JavaSdk {
 
   @Override
   public boolean isValidSdkHome(String path) {
-    if (!checkForJdk(new File(path))) {
-      return false;
-    }
-    return !JrtFileSystem.isModularJdk(path) || JrtFileSystem.isSupported();
+    return checkForJdk(new File(path)) &&
+           (!JrtFileSystem.isModularJdk(path) || JrtFileSystem.isSupported());
   }
 
   @Override
@@ -631,4 +629,4 @@ public class JavaSdkImpl extends JavaSdk {
            type == JavadocOrderRootType.getInstance() ||
            type == AnnotationOrderRootType.getInstance();
   }
-}
+}
\ No newline at end of file