diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 096810d867..3e614f9c8e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-23  Tom Tromey  <tromey@redhat.com>
+
+	PR python/11391:
+	* python/py-value.c (valpy_nonzero): Don't throw error for other
+	Value types.
+
 2010-08-23  Tom Tromey  <tromey@redhat.com>
 
 	PR python/10676:
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index d547ed1b17..75ee0de4db 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -712,11 +712,8 @@ valpy_nonzero (PyObject *self)
 			     TYPE_LENGTH (type),
 			     gdbarch_byte_order (get_type_arch (type)));
   else
-    {
-      PyErr_SetString (PyExc_TypeError, _("Attempted truth testing on invalid "
-					  "gdb.Value type."));
-      return 0;
-    }
+    /* All other values are True.  */
+    return 1;
 }
 
 /* Implements ~ for value objects.  */