diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index fecc0c686..2acee48d5 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -1748,7 +1748,10 @@ emit_event (ClutterEvent *event,
 
   /* reentrancy check */
   if (lock != FALSE)
-    return;
+    {
+      g_warning ("Tried emitting event during event delivery, bailing out.n");
+      return;
+    }
 
   lock = TRUE;