@@ -465,6 +465,10 @@ typedef PyObject* (*f20)(PyObject*, PyObject*, PyObject*, PyObject*, PyObject*,
 #define _CALL_ARITY(FUN, ...) ( (_PICK_FUN_CAST(NULL, ##__VA_ARGS__, f20, f19, f18, f17, f16, f15, f14, f13, f12, f11, f10, f9, f8, f7, f6, f5, f4, f3, f2, f1, f0))(FUN))(__VA_ARGS__)
 #define ARG(__n) explicit_cast((PyObject*)polyglot_get_arg((__n)))
 
+int wrap_setter(PyCFunction fun, PyObject* self, PyObject* value, PyObject* closure) {
+    return _CALL_ARITY(fun, ARG(1), ARG(2), ARG(3));
+}
+
 void* wrap_direct(PyCFunction fun, ...) {
 	PyObject *res = NULL;
 	switch(polyglot_get_arg_count()-1) {
 
@@ -110,6 +110,7 @@ void initialize_hashes();
 
 // prototype of C landing function
 void* wrap_direct(PyCFunction fun, ...);
+int wrap_setter(PyCFunction fun, PyObject *self, PyObject *value, PyObject *closure);
 void* wrap_varargs(PyCFunction fun, PyObject *module, PyObject *varargs);
 void* wrap_keywords(PyCFunctionWithKeywords fun, PyObject *module, PyObject *varargs, PyObject *kwargs);
 void* wrap_noargs(PyCFunction fun, PyObject *module, PyObject *pnone);
 
@@ -333,7 +333,7 @@ int PyType_Ready(PyTypeObject* cls) {
                            getter_fun != NULL ? getter_fun : to_java(Py_None),
                            wrap_direct,
                            setter_fun != NULL ? setter_fun : to_java(Py_None),
-                           wrap_direct,
+                           wrap_setter,
                            getset.doc ? truffle_read_string(getset.doc) : truffle_read_string(""),
                            // do not convert the closure, it is handed to the
                            // getter and setter as-is
 
@@ -679,7 +679,9 @@ def member_getter(self):
     if setter:
         setter_w = CreateFunction(name, setter, setter_wrapper)
         def member_setter(self, value):
-            setter_w(self, value, closure)
+            result = setter_w(self, value, closure)
+            if result != 0:
+                raise
             return None
         getset.setter(member_setter)
     else: