diff --git a/pybindgen/pybindgen/typehandlers/base.py b/pybindgen/pybindgen/typehandlers/base.py
--- a/pybindgen/pybindgen/typehandlers/base.py
+++ b/pybindgen/pybindgen/typehandlers/base.py
@@ -627,7 +627,10 @@
         else:
             ## parse the return value
             ## this ensures that py_retval is always a tuple
+            self.before_call.write_code('if (!PyTuple_Check(py_retval))')
+            self.before_call.indent()
             self.before_call.write_code('py_retval = Py_BuildValue((char*) "(N)", py_retval);')
+            self.before_call.unindent()
 
             parse_tuple_params = ['py_retval']
             parse_params = self.parse_params.get_parameters()