diff --git a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
index 0c997ab09b..7cd79b02f6 100644
--- a/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
+++ b/pmd-jedit/src/net/sourceforge/pmd/jedit/PMDJEditPlugin.java
@@ -58,7 +58,10 @@ public class PMDJEditPlugin extends EditPlugin {
     public void instanceCheckDirectory(View view) {
         if (jEdit.getBooleanProperty(PMDJEditPlugin.OPTION_UI_DIRECTORY_POPUP)) {
             final String dir = JOptionPane.showInputDialog(jEdit.getFirstView(), "Please type in a directory to scan", NAME, JOptionPane.QUESTION_MESSAGE);
-            if (dir == null || !(new File(dir)).exists() || !(new File(dir)).isDirectory() ) {
+            if (dir == null) {
+                return;
+            }
+            if (!(new File(dir)).exists() || !(new File(dir)).isDirectory() ) {
                 JOptionPane.showMessageDialog(jEdit.getFirstView(), dir + " is not a valid directory name", NAME, JOptionPane.ERROR_MESSAGE);
                 return;
             }
@@ -81,7 +84,10 @@ public class PMDJEditPlugin extends EditPlugin {
     public void instanceCheckDirectoryRecursively(View view) {
         if (jEdit.getBooleanProperty(PMDJEditPlugin.OPTION_UI_DIRECTORY_POPUP)) {
             final String dir = JOptionPane.showInputDialog(jEdit.getFirstView(), "Please type in a directory to scan recursively", NAME, JOptionPane.QUESTION_MESSAGE);
-            if (dir == null || !(new File(dir)).exists() || !(new File(dir)).isDirectory() ) {
+            if (dir == null) {
+                return;
+            }
+            if (!(new File(dir)).exists() || !(new File(dir)).isDirectory() ) {
                 JOptionPane.showMessageDialog(jEdit.getFirstView(), dir + " is not a valid directory name", NAME, JOptionPane.ERROR_MESSAGE);
                 return;
             }