diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
index 4c10dc201..697c9303d 100644
--- a/config/checkstyle_sevntu_checks.xml
+++ b/config/checkstyle_sevntu_checks.xml
@@ -182,7 +182,13 @@
                    ### InnerInterface(.*)
                    ### InnerClass(.*)"/>
     </module>
-    <module name="LogicConditionNeedOptimizationCheck"/>
+    <module name="LogicConditionNeedOptimizationCheck">
+      <!-- This rule is wrong. You cannot optimize "return executeEmergencyBrake() && someCondition"
+      to "return someCondition && executeEmergencyBrake()". The short circuit evaluation of boolean
+      expressions will lead to the method not being called, even if it has a wanted side effect
+      (something that changes global state). -->
+      <property name="severity" value="ignore"/>
+    </module>
     <module name="AvoidConditionInversionCheck"/>
     <module name="SingleBreakOrContinueCheck"/>
     <module name="NumericLiteralNeedsUnderscoreCheck"/>
diff --git a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java
index 1f2480e2b..3cf85230e 100644
--- a/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java
+++ b/net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/config/CheckConfigurationConfigureDialog.java
@@ -139,7 +139,7 @@ public class CheckConfigurationConfigureDialog extends TitleAreaDialog {
   /** Button to remove a module. */
   private Button mRemoveButton;
 
-  /** Button to remove a module. */
+  /** Button to edit a module. */
   private Button mEditButton;
 
   /** Group containing the table viewer. */
@@ -663,7 +663,7 @@ private void openModule(ISelection selection) {
         RuleConfigurationEditDialog dialog = new RuleConfigurationEditDialog(getShell(),
                 workingCopy, !mConfigurable,
                 Messages.CheckConfigurationConfigureDialog_titleModuleConfigEditor);
-        if (mConfigurable && Window.OK == dialog.open()) {
+        if (Window.OK == dialog.open() && mConfigurable) {
           mModules.set(mModules.indexOf(module), workingCopy);
           mIsDirty = true;
           mTableViewer.refresh(true);