diff --git a/pmd-jbuilder/lib/PMDOpenTool.jar b/pmd-jbuilder/lib/PMDOpenTool.jar
index ad5d4eb943..307c36c2f7 100644
Binary files a/pmd-jbuilder/lib/PMDOpenTool.jar and b/pmd-jbuilder/lib/PMDOpenTool.jar differ
diff --git a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java
index eade2f8071..24e7e7d532 100644
--- a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java
+++ b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java
@@ -39,7 +39,6 @@ public class PMDOpenTool {
      * Default constructor
      */
     public PMDOpenTool () {
-        int i;
     }
 
     /**
@@ -108,7 +107,7 @@ public class PMDOpenTool {
         RuleSetFactory ruleSetFactory = new RuleSetFactory();
         RuleSet rules = constructRuleSets(ruleSetFactory, pmd);
         if (rules == null)
-            return  null;
+            return  new Report();
         ctx.setReport(new Report());
         ctx.setSourceCodeFilename("this");
         try {
@@ -235,10 +234,12 @@ class PMDMessage extends Message {
                 browser.setActiveViewer(javaNode, viewer, requestFocus);
                 EditorPane editor = viewer.getEditor();
                 editor.gotoPosition(line, column, false, EditorPane.CENTER_IF_NEAR_EDGE);
-                if (requestFocus)
+                if (requestFocus) {
                     editor.requestFocus();
-                else
+                }
+                else {
                     editor.setTemporaryMark(line, MARK);
+                }
             }
         } catch (Exception ex) {
             ex.printStackTrace();
diff --git a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java
index d07f04ca5c..6a5ffacbb6 100644
--- a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java
+++ b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java
@@ -70,10 +70,12 @@ public class RuleSetPropertyPage extends PropertyPage {
         //loop through the sets of rules and place them in the appropriate pane based upon their setting
         for (int i = 0; i < RuleSetPropertyGroup.RULESET_NAMES.length; i++) {
             ListEntry le = new ListEntry(RuleSetPropertyGroup.RULESET_NAMES[i], RuleSetPropertyGroup.PROPKEYS[i]);
-            if (Boolean.valueOf(RuleSetPropertyGroup.PROPKEYS[i].getValue()).booleanValue())
+            if (Boolean.valueOf(RuleSetPropertyGroup.PROPKEYS[i].getValue()).booleanValue()) {
                 dlmSelectedRuleSets.addElement(le);
-            else
+            }
+            else {
                 dlmAvailableRuleSets.addElement(le);
+            }
         }
     }