diff --git a/blocks.js b/blocks.js
index 9487ac5f..7ad1f3a8 100644
--- a/blocks.js
+++ b/blocks.js
@@ -1953,7 +1953,7 @@ SyntaxElementMorph.prototype.showBubble = function (value, exportPic, target) {
     if (ide && (ide.currentSprite !== target)) {
         if (target instanceof StageMorph) {
             anchor = ide.corral.stageIcon;
-        } else {
+        } else if (target) {
         	if (target.isTemporary) {
          		target = detect(
 					target.allExemplars(),
@@ -1964,6 +1964,8 @@ SyntaxElementMorph.prototype.showBubble = function (value, exportPic, target) {
                 ide.corral.frame.contents.children,
                 function (icon) {return icon.object === target; }
             );
+        } else {
+        	target = ide;
         }
         pos = anchor.center();
     }
diff --git a/history.txt b/history.txt
index 632ab9d7..ec8cdf0d 100755
--- a/history.txt
+++ b/history.txt
@@ -3875,6 +3875,7 @@ Fixes:
 * Objects: added "rotate" option to Sprite context menu
 * Threads, Blocks: fixed Joan's fix for #1972, because it broke HOFs
 * new Sound Recorder, yay!! Thanks, Bernat!
+* Blocks: fixed a glitch in the error-bubble handling mechanism