diff --git a/extras/Build/juceaide/Main.cpp b/extras/Build/juceaide/Main.cpp
index 63f7140a32..32ba1c7db1 100644
--- a/extras/Build/juceaide/Main.cpp
+++ b/extras/Build/juceaide/Main.cpp
@@ -570,5 +570,13 @@ int main (int argc, char** argv)
         {
             juce::ConsoleApplication::fail (error.message);
         }
+        catch (const std::exception& ex)
+        {
+            juce::ConsoleApplication::fail (ex.what());
+        }
+        catch (...)
+        {
+            juce::ConsoleApplication::fail ("Unhandled exception");
+        }
     });
 }
diff --git a/modules/juce_core/misc/juce_ConsoleApplication.cpp b/modules/juce_core/misc/juce_ConsoleApplication.cpp
index 89cc06de03..a9f5c3e3c0 100644
--- a/modules/juce_core/misc/juce_ConsoleApplication.cpp
+++ b/modules/juce_core/misc/juce_ConsoleApplication.cpp
@@ -308,7 +308,7 @@ int ConsoleApplication::invokeCatchingFailures (std::function<int()>&& f)
     }
     catch (const ConsoleAppFailureCode& error)
     {
-        std::cerr << error.errorMessage << std::endl;
+        std::cerr << error.errorMessage << std::endl << std::flush;
         returnCode = error.returnCode;
     }