diff --git a/src/Umbraco.Core/UmbracoApplicationBase.cs b/src/Umbraco.Core/UmbracoApplicationBase.cs
index 07e3a6bbf3..550228e3a8 100644
--- a/src/Umbraco.Core/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Core/UmbracoApplicationBase.cs
@@ -36,6 +36,19 @@ namespace Umbraco.Core
             //don't output the MVC version header (security)
             MvcHandler.DisableMvcResponseHeader = true;
 
+            //take care of unhandled exceptions - there is nothing we can do to 
+            // prevent the entire w3wp process to go down but at least we can try
+            // and log the exception
+            AppDomain.CurrentDomain.UnhandledException += (_, args) =>
+            {
+                var exception = (Exception) args.ExceptionObject;
+                var isTerminating = args.IsTerminating; // always true?
+
+                var msg = "Unhandled exception in AppDomain";
+                if (isTerminating) msg += " (terminating)";
+                LogHelper.Error<UmbracoApplicationBase>(msg, exception);
+            };
+
             //boot up the application
             GetBootManager()
                 .Initialize()