losttech
diff --git a/‎src/runtime/converter.cs‎
Lines changed: 7 additions & 1 deletion b/‎src/runtime/converter.cs‎
Lines changed: 7 additions & 1 deletion
@@ -361,6 +361,12 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
                     }
                     result = cb.type.Value;
                     return true;
+
+                case null:
+                    break;
+
+                default:
+                    throw new ArgumentException("We should never receive instances of other managed types");
             }
 
             if (value == Runtime.PyNone && !obType.IsValueType)
@@ -513,7 +519,7 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
             {
                 if (setError)
                 {
-                    Exceptions.SetError(ex.InnerException);
+                    Exceptions.SetError(ex);
                 }
                 return null;
             }
Original file line number	Diff line number	Diff line change
@@ -361,6 +361,12 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
361	361	}
362	362	result = cb.type.Value;
363	363	return true;
	364	+
	365	+ case null:
	366	+ break;
	367	+
	368	+ default:
	369	+ throw new ArgumentException("We should never receive instances of other managed types");
364	370	}
365	371
366	372	if (value == Runtime.PyNone && !obType.IsValueType)
@@ -513,7 +519,7 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
513	519	{
514	520	if (setError)
515	521	{
516		- Exceptions.SetError(ex.InnerException);
	522	+ Exceptions.SetError(ex);
517	523	}
518	524	return null;
519	525	}