diff --git a/src/TraceEvent/ETWTraceEventSource.cs b/src/TraceEvent/ETWTraceEventSource.cs
index 5fa723796..710805364 100644
--- a/src/TraceEvent/ETWTraceEventSource.cs
+++ b/src/TraceEvent/ETWTraceEventSource.cs
@@ -879,7 +879,10 @@ protected override void Dispose(bool disposing)
                 {
                     foreach (TraceEventNativeMethods.SafeTraceHandle handle in handles)
                     {
-                        handle.Dispose();
+                        if(handle != null && handle.IsValid)
+                        {
+                            handle.Dispose();
+                        }
                     }
 
                     handles = null;