diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index b9583d8b6..b085173bf 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -42,6 +42,7 @@ import java.awt.Toolkit;
 import java.awt.color.ColorSpace;
 import java.awt.image.BufferedImage;
 
+
 // used by loadImage() functions
 import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
@@ -1830,6 +1831,11 @@ public class PApplet implements PConstants {
       // drawing context needs to be re-built before the next frame.
       int pquality = g.quality;
 
+      if (insideDraw) {
+        System.err.println("handleDraw() called before finishing");
+        System.exit(1);
+      }
+
       insideDraw = true;
       g.beginDraw();
       if (recorder != null) {