diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h
index df9a708b4b..47d32b98db 100644
--- a/modules/juce_core/system/juce_PlatformDefs.h
+++ b/modules/juce_core/system/juce_PlatformDefs.h
@@ -217,11 +217,11 @@ namespace juce
     #define JUCE_CATCH_EXCEPTION \
       catch (const std::exception& e)  \
       { \
-          JUCEApplication::sendUnhandledException (&e, __FILE__, __LINE__); \
+          juce::JUCEApplication::sendUnhandledException (&e, __FILE__, __LINE__); \
       } \
       catch (...) \
       { \
-          JUCEApplication::sendUnhandledException (nullptr, __FILE__, __LINE__); \
+          juce::JUCEApplication::sendUnhandledException (nullptr, __FILE__, __LINE__); \
       }
   #endif
 
diff --git a/modules/juce_gui_basics/components/juce_Component.cpp b/modules/juce_gui_basics/components/juce_Component.cpp
index dfdd16b587..35a5ab8b17 100644
--- a/modules/juce_gui_basics/components/juce_Component.cpp
+++ b/modules/juce_gui_basics/components/juce_Component.cpp
@@ -2310,6 +2310,9 @@ void Component::internalMouseEnter (MouseInputSource& source, const Point<int>&
 
 void Component::internalMouseExit (MouseInputSource& source, const Point<int>& relativePos, const Time& time)
 {
+    if (isCurrentlyBlockedByAnotherModalComponent() && source.getComponentUnderMouse() != this)
+        return;
+
     if (flags.repaintOnMouseActivityFlag)
         repaint();