--- MySQL-python-1.2.0/_mysql.c	2005-02-08 02:00:54.000000000 +0100
+++ MySQL-python-1.2.0-mj/_mysql.c	2005-06-16 02:44:56.000000000 +0200
@@ -1176,20 +1186,25 @@
 	unsigned long length)
 {
 	PyObject *v;
-	if (rowitem) {
-		if (converter != Py_None)
-			v = PyObject_CallFunction(converter,
-						  "s#",
-						  rowitem,
-						  (int)length);
-		else
+/* 
+	17.06.2005, mJ
+	also convert NULL values if possible
+*/
+	if (converter != Py_None) {
+		v = PyObject_CallFunction(converter,
+					  "s#",
+					  rowitem,
+					  (int)length);
+	} else {
+		if (rowitem) {
 			v = PyString_FromStringAndSize(rowitem,
 						       (int)length);
-		if (!v)
-			return NULL;
-	} else {
-		Py_INCREF(Py_None);
-		v = Py_None;
+			if (!v)
+				return NULL;
+		} else {
+			Py_INCREF(Py_None);
+			v = Py_None;
+		}
 	}
 	return v;
 }