diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index f32f9e508..ff4dbf855 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -63,6 +63,7 @@
     <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Exceptioneer.WindowsFormsClient, Version=1.0.0.812, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="Ninject">
       <HintPath>..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll</HintPath>
     </Reference>
diff --git a/NzbDrone/Providers/MonitoringProvider.cs b/NzbDrone/Providers/MonitoringProvider.cs
index 95dfa13d5..88ff9e887 100644
--- a/NzbDrone/Providers/MonitoringProvider.cs
+++ b/NzbDrone/Providers/MonitoringProvider.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Runtime.Remoting;
 using System.Timers;
+using Exceptioneer.WindowsFormsClient;
 using NLog;
 using Ninject;
 using NzbDrone.Common;
@@ -106,15 +107,15 @@ namespace NzbDrone.Providers
         {
             Console.WriteLine("EPIC FAIL: {0}", excepion);
 
-#if DEBUG
-#else
-            new Client
+            if (EnviromentProvider.IsProduction)
             {
-                ApiKey = "43BBF60A-EB2A-4C1C-B09E-422ADF637265",
-                ApplicationName = "NzbDrone",
-                CurrentException = excepion as Exception
-            }.Submit();
-#endif
+                new Client
+                    {
+                        ApiKey = "43BBF60A-EB2A-4C1C-B09E-422ADF637265",
+                        ApplicationName = "NzbDrone",
+                        CurrentException = excepion as Exception
+                    }.Submit();
+            }
 
             Logger.Fatal("EPIC FAIL: {0}", excepion);
         }