diff --git a/src/pya/pya/pyaCallables.cc b/src/pya/pya/pyaCallables.cc
index 5db850fe1..f9fd2c75f 100644
--- a/src/pya/pya/pyaCallables.cc
+++ b/src/pya/pya/pyaCallables.cc
@@ -1285,7 +1285,14 @@ property_setter_impl (int mid, PyObject *self, PyObject *value)
 
     meth->call (obj, arglist, retlist);
 
-    return get_return_value (p, retlist, meth, heap);
+    PyObject *ret = get_return_value (p, retlist, meth, heap);
+
+    if (ret == NULL) {
+      Py_INCREF (Py_None);
+      ret = Py_None;
+    }
+
+    return ret;
 
   }
 }