diff --git a/java/src/processing/mode/java/DebugTray.java b/java/src/processing/mode/java/DebugTray.java
index cce12dd7e..03c802d78 100644
--- a/java/src/processing/mode/java/DebugTray.java
+++ b/java/src/processing/mode/java/DebugTray.java
@@ -100,9 +100,11 @@ public class DebugTray extends JFrame {
     this.editor = editor;    
     editor.addComponentListener(new EditorFollower());
 
-    setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
-    add(createToolbar());
-    add(createScrollPane());
+    //setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+    Box box = Box.createVerticalBox();
+    box.add(createToolbar());
+    box.add(createScrollPane());
+    getContentPane().add(box);
     pack();
     
     /*
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index c04dc96f0..77b09c80d 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -2174,9 +2174,11 @@ public class JavaEditor extends Editor {
       ta.clearGutterText();
       // load appropriate line backgrounds for tab
       // first paint breakpoints
-      for (LineHighlight hl : breakpointedLines) {
-        if (isInCurrentTab(hl.getLineID())) {
-          hl.paint();
+      if (breakpointedLines != null) {
+        for (LineHighlight hl : breakpointedLines) {
+          if (isInCurrentTab(hl.getLineID())) {
+            hl.paint();
+          }
         }
       }
       // now paint current line (if any)