diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
index 7677d5097b5e..1aeb2a43bba8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
@@ -589,7 +589,7 @@ public class BreakpointManager implements JDOMExternalizable {
 
           }
         }
-        catch (InvalidDataException e) {
+        catch (InvalidDataException ignored) {
         }
 
         final Element rulesGroup = parentNode.getChild(RULES_GROUP_NAME);
@@ -827,7 +827,7 @@ public class BreakpointManager implements JDOMExternalizable {
   //interaction with RequestManagerImpl
   public void disableBreakpoints(final DebugProcessImpl debugProcess) {
     final List<Breakpoint> breakpoints = getBreakpoints();
-    if (breakpoints.size() > 0) {
+    if (!breakpoints.isEmpty()) {
       final RequestManagerImpl requestManager = debugProcess.getRequestsManager();
       for (Breakpoint breakpoint : breakpoints) {
         breakpoint.markVerified(requestManager.isVerified(breakpoint));
@@ -843,7 +843,7 @@ public class BreakpointManager implements JDOMExternalizable {
 
   public void enableBreakpoints(final DebugProcessImpl debugProcess) {
     final List<Breakpoint> breakpoints = getBreakpoints();
-    if (breakpoints.size() > 0) {
+    if (!breakpoints.isEmpty()) {
       for (Breakpoint breakpoint : breakpoints) {
         breakpoint.markVerified(false); // clean cached state
         breakpoint.createRequest(debugProcess);
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
index 7ddf469f971b..e7344f03245d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
@@ -415,7 +415,8 @@ public abstract class BreakpointWithHighlighter extends Breakpoint {
   }
 
   private void setupGutterRenderer() {
-    getHighlighter().setGutterIconRenderer(new MyGutterIconRenderer());
+    MyGutterIconRenderer renderer = new MyGutterIconRenderer(getIcon(), getDescription());
+    getHighlighter().setGutterIconRenderer(renderer);
   }
 
   public abstract Key<? extends BreakpointWithHighlighter> getCategory();
@@ -623,13 +624,21 @@ public abstract class BreakpointWithHighlighter extends Breakpoint {
     }
 
   private class MyGutterIconRenderer extends GutterIconRenderer {
+    private final Icon myIcon;
+    private final String myDescription;
+
+    public MyGutterIconRenderer(Icon icon, String description) {
+      myIcon = icon;
+      myDescription = description;
+    }
+
     @NotNull
     public Icon getIcon() {
-      return BreakpointWithHighlighter.this.getIcon();
+      return myIcon;
     }
 
     public String getTooltipText() {
-      return getDescription();
+      return myDescription;
     }
 
     public AnAction getClickAction() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
index e81a3a7849c6..5f33b7b257a4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
@@ -539,7 +539,8 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
   private void paintIconRow(int line, ArrayList<GutterIconRenderer> row, final Graphics g) {
     processIconsRow(line, row, new LineGutterIconRendererProcessor() {
       public void process(int x, int y, GutterIconRenderer renderer) {
-        renderer.getIcon().paintIcon(EditorGutterComponentImpl.this, g, x, y);
+        Icon icon = renderer.getIcon();
+        icon.paintIcon(EditorGutterComponentImpl.this, g, x, y);
       }
     });
   }