diff --git a/ATxDiagnostics/ATxDiagnostics.cs b/ATxDiagnostics/ATxDiagnostics.cs
index 68219eda4457f52053c4e1cf4a3705e386bdbbf1..3ddd8c8cb69541deea2ec4fd90332d4ffb9d16c7 100644
--- a/ATxDiagnostics/ATxDiagnostics.cs
+++ b/ATxDiagnostics/ATxDiagnostics.cs
@@ -58,23 +58,20 @@ namespace ATxDiagnostics
             var searcher = new ManagementObjectSearcher("", queryString, opts);
             Int32 usageInt32 = -1;
 
-
             var managementObjects = searcher.Get();
-            if (managementObjects.Count == 0) {
-                Log.Error("No objects returned from WMI!");
-                watch.Stop();
-                Log.Debug("WMI query took {0} ms.", watch.ElapsedMilliseconds);
-                return -1;
-            }
-            Log.Trace("WMI query returned {0} objects.", managementObjects.Count);
-            foreach (var mo in managementObjects) {
-                var obj = (ManagementObject)mo;
-                var usage = obj["PercentProcessorTime"];
-                var name = obj["Name"];
-                    
-                usageInt32 = Convert.ToInt32(usage);
-                Log.Trace("CPU usage {1}: {0}", usageInt32, name);
+            if (managementObjects.Count > 0) {
+                Log.Debug("WMI query returned {0} objects.", managementObjects.Count);
+                foreach (var mo in managementObjects) {
+                    var obj = (ManagementObject)mo;
+                    var usage = obj["PercentProcessorTime"];
+                    var name = obj["Name"];
 
+                    usageInt32 = Convert.ToInt32(usage);
+                    Log.Debug("CPU usage {1}: {0}", usageInt32, name);
+
+                }
+            } else {
+                Log.Error("No objects returned from WMI!");
             }
 
             managementObjects.Dispose();