@@ -140,10 +140,12 @@ internal static void Shutdown()
             foreach (FieldInfo fi in type.GetFields(BindingFlags.Public | BindingFlags.Static))
             {
                 var op = (IntPtr)fi.GetValue(type);
-                if (op != IntPtr.Zero)
+                if (op == IntPtr.Zero)
                 {
-                    Runtime.XDecref(op);
+                    continue;
                 }
+                Runtime.XDecref(op);
+                fi.SetValue(null, IntPtr.Zero);
             }
             Runtime.Py_CLEAR(ref exceptions_module);
             Runtime.Py_CLEAR(ref warnings_module);
 
@@ -499,16 +499,9 @@ internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)
             {
                 return ThunkInfo.Empty;
             }
-            try
-            {
-                Delegate d = Delegate.CreateDelegate(dt, method);
-                var info = new ThunkInfo(d);
-                return info;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
+            Delegate d = Delegate.CreateDelegate(dt, method);
+            var info = new ThunkInfo(d);
+            return info;
         }
 
 
 
@@ -358,9 +358,7 @@ internal static void Shutdown()
             }
 #endif
             AssemblyManager.Shutdown();
-            Exceptions.Shutdown();
             ImportHook.Shutdown();
-            Finalizer.Shutdown();
 
 #if !NETSTANDARD
             if (mode != ShutdownMode.Reload)
@@ -377,6 +375,9 @@ internal static void Shutdown()
             MetaType.Release();
             PyCLRMetaType = IntPtr.Zero;
 
+            Exceptions.Shutdown();
+            Finalizer.Shutdown();
+
             if (mode != ShutdownMode.Normal)
             {
                 PyGC_Collect();
Original file line number	Diff line number	Diff line change
@@ -140,10 +140,12 @@ internal static void Shutdown()
140	140	foreach (FieldInfo fi in type.GetFields(BindingFlags.Public \| BindingFlags.Static))
141	141	{
142	142	var op = (IntPtr)fi.GetValue(type);
143		- if (op != IntPtr.Zero)
	143	+ if (op == IntPtr.Zero)
144	144	{
145		- Runtime.XDecref(op);
	145	+ continue;
146	146	}
	147	+ Runtime.XDecref(op);
	148	+ fi.SetValue(null, IntPtr.Zero);
147	149	}
148	150	Runtime.Py_CLEAR(ref exceptions_module);
149	151	Runtime.Py_CLEAR(ref warnings_module);
Original file line number	Diff line number	Diff line change
@@ -499,16 +499,9 @@ internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)
499	499	{
500	500	return ThunkInfo.Empty;
501	501	}
502		- try
503		- {
504		- Delegate d = Delegate.CreateDelegate(dt, method);
505		- var info = new ThunkInfo(d);
506		- return info;
507		- }
508		- catch (Exception)
509		- {
510		- throw;
511		- }
	502	+ Delegate d = Delegate.CreateDelegate(dt, method);
	503	+ var info = new ThunkInfo(d);
	504	+ return info;
512	505	}
513	506
514	507