@@ -225,6 +225,12 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
 			mt = ManagedType.GetManagedObject(value);
 		    }
 		}
+		IntPtr c = Exceptions.UnwrapExceptionClass(value);
+		if ((c != IntPtr.Zero) && (c != value)) {
+		    value = c;
+		    Runtime.Decref(c);
+		    mt = ManagedType.GetManagedObject(value);
+		}
 	    }
 	    }
 
 
@@ -192,6 +192,23 @@ internal static IntPtr GetExceptionInstanceWrapper(IntPtr real) {
 	    return op;
 	}
 
+	internal static IntPtr UnwrapExceptionClass(IntPtr op) {
+	    // In some cases its necessary to recognize an exception *class*,
+	    // and obtain the inner (wrapped) exception class. This method
+	    // returns the inner class if found, or a null pointer.
+
+	    IntPtr d = Runtime.PyObject_GetAttrString(op, "__dict__");
+	    if (d == IntPtr.Zero) {
+		Exceptions.Clear();
+		return IntPtr.Zero;
+	    }
+	    IntPtr c = Runtime.PyDict_GetItemString(d, "_class");
+	    Runtime.Decref(d);
+	    if (c == IntPtr.Zero) {
+		Exceptions.Clear();
+	    }
+	    return c;
+	}
 
 
 	/// <summary>
 
@@ -47,18 +47,17 @@ internal static ManagedType GetManagedObject(IntPtr ob) {
 		    return (ManagedType)gc.Target;
 		}
 
-
-//  		// Hmm - check to see if its a wrapped exception?
-//  		if (Runtime.wrap_exceptions) {
-//  		    IntPtr p = Runtime.PyObject_GetAttrString(ob, "_inner");
-//  		    if (p != IntPtr.Zero) {
-//  			ManagedType m = GetManagedObject(p);
-//  			Runtime.Decref(p);
-//  			if (m != null)
-//  			    return m;
-//  		    }
-//  		}
-
+		// In certain situations, we need to recognize a wrapped
+		// exception class and be willing to unwrap the class :(
+
+		if (Runtime.wrap_exceptions) {
+		    IntPtr e = Exceptions.UnwrapExceptionClass(ob);
+		    if ((e != IntPtr.Zero) && (e != ob)) {
+			ManagedType m = GetManagedObject(e);
+			Runtime.Decref(e);
+			return m;
+		    }
+		}
 	    }
 	    return null;
 	}
Original file line number	Diff line number	Diff line change
@@ -225,6 +225,12 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
225	225	mt = ManagedType.GetManagedObject(value);
226	226	}
227	227	}
	228	+ IntPtr c = Exceptions.UnwrapExceptionClass(value);
	229	+ if ((c != IntPtr.Zero) && (c != value)) {
	230	+ value = c;
	231	+ Runtime.Decref(c);
	232	+ mt = ManagedType.GetManagedObject(value);
	233	+ }
228	234	}
229	235	}
230	236