diff --git a/Wox/App.xaml.cs b/Wox/App.xaml.cs
index dc9d159461..5b239e0851 100644
--- a/Wox/App.xaml.cs
+++ b/Wox/App.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Windows;
@@ -32,9 +33,7 @@ namespace Wox
             Stopwatch.Debug("Startup Time", () =>
             {
                 base.OnStartup(e);
-                DispatcherUnhandledException += ErrorReporting.DispatcherUnhandledException;
-                AppDomain.CurrentDomain.UnhandledException += ErrorReporting.UnhandledExceptionHandle;
-
+                RegisterUnhandledException();
                 ThreadPool.QueueUserWorkItem(o => { ImageLoader.ImageLoader.PreloadImages(); });
                 Window = new MainWindow();
                 PluginManager.Init(Window);
@@ -43,6 +42,14 @@ namespace Wox
 
         }
 
+        [Conditional("DEBUG")]
+        private void RegisterUnhandledException()
+        {
+            // let exception throw as normal is better for Debug
+            DispatcherUnhandledException += ErrorReporting.DispatcherUnhandledException;
+            AppDomain.CurrentDomain.UnhandledException += ErrorReporting.UnhandledExceptionHandle;
+        }
+
         public bool OnActivate(IList<string> args)
         {
             CommandArgsFactory.Execute(args);