diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index 09fc78305..12aac7b9b 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -1210,10 +1210,13 @@ public class Sketch {
     current = code[which];
     currentIndex = which;
     current.visited = System.currentTimeMillis();
-
-    editor.setCode(current);
+    try {
+      editor.setCode(current);
 //    editor.header.rebuild();
-    editor.header.repaint();
+      editor.header.repaint();
+    } catch (NullPointerException e) {
+      e.printStackTrace();
+    }
   }