diff --git a/ChangeLog b/ChangeLog
index 064a73bc21..ad5513c575 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-17  Manish Singh  <yosh@gimp.org>
+
+	* plug-ins/pygimp/gimpmodule.c
+	* plug-ins/pygimp/pygimp-drawable.c: revert to old behavior of
+	parasite_find functions returning None when there isn't a parasite
+	found. Fixed bug #310666.
+
 2005-07-17  Nathan Summers  <rock@gimp.org>
 
 	* libgimpwidgets/gimpresolutionentry.[ch]: spiffy new widget that given
diff --git a/plug-ins/pygimp/gimpmodule.c b/plug-ins/pygimp/gimpmodule.c
index a3d97f518c..5a31ab92c2 100644
--- a/plug-ins/pygimp/gimpmodule.c
+++ b/plug-ins/pygimp/gimpmodule.c
@@ -1161,19 +1161,11 @@ static PyObject *
 pygimp_parasite_find(PyObject *self, PyObject *args)
 {
     char *name;
-    GimpParasite *para;
 
     if (!PyArg_ParseTuple(args, "s:parasite_find", &name))
 	return NULL;
 
-    para = gimp_parasite_find(name);
-
-    if (!para) {
-	PyErr_Format(pygimp_error, "could not find parasite '%s'", name);
-	return NULL;
-    }
-
-    return pygimp_parasite_new(para);
+    return pygimp_parasite_new(gimp_parasite_find(name));
 }
 
 static PyObject *
diff --git a/plug-ins/pygimp/pygimp-drawable.c b/plug-ins/pygimp/pygimp-drawable.c
index 0d69897aeb..bcfa7aa5a8 100644
--- a/plug-ins/pygimp/pygimp-drawable.c
+++ b/plug-ins/pygimp/pygimp-drawable.c
@@ -195,21 +195,11 @@ static PyObject *
 drw_parasite_find(PyGimpDrawable *self, PyObject *args)
 {
     char *name;
-    GimpParasite *para;
 
     if (!PyArg_ParseTuple(args, "s:parasite_find", &name))
 	return NULL;
 
-    para = gimp_drawable_parasite_find(self->ID, name);
-
-    if (!para) {
-	PyErr_Format(pygimp_error,
-		     "could not find parasite '%s' on drawable (ID %d)",
-		     name, self->ID);
-	return NULL;
-    }
-
-    return pygimp_parasite_new(para);
+    return pygimp_parasite_new(gimp_drawable_parasite_find(self->ID, name));
 }
 
 static PyObject *