diff --git a/modules/juce_events/messages/juce_MessageManager.cpp b/modules/juce_events/messages/juce_MessageManager.cpp
index 5ee02edd26..862a2ae277 100644
--- a/modules/juce_events/messages/juce_MessageManager.cpp
+++ b/modules/juce_events/messages/juce_MessageManager.cpp
@@ -118,7 +118,7 @@ bool MessageManager::runDispatchLoopUntil (int millisecondsToRunFor)
         }
         JUCE_CATCH_EXCEPTION
 
-        if (millisecondsToRunFor >= 0 && Time::currentTimeMillis() >= currentTime)
+        if (millisecondsToRunFor >= 0 && Time::currentTimeMillis() >= endTime)
             break;
     }
 
diff --git a/modules/juce_gui_basics/widgets/juce_Label.cpp b/modules/juce_gui_basics/widgets/juce_Label.cpp
index b62220f6e3..0005b52216 100644
--- a/modules/juce_gui_basics/widgets/juce_Label.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Label.cpp
@@ -209,6 +209,10 @@ void Label::showEditor()
         editor->setText (getText(), false);
         editor->addListener (this);
         editor->grabKeyboardFocus();
+
+        if (editor == nullptr) // may be deleted by a callback
+            return;
+
         editor->setHighlightedRegion (Range<int> (0, textValue.toString().length()));
 
         resized();