diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4894c0d0895..5c4e29067a8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-20  Tom Tromey  <tromey@redhat.com>
+
+	* python/py-event.c (gdbpy_initialize_event_generic): Return
+	early if PyType_Ready fails.
+
 2013-05-20  Tom Tromey  <tromey@redhat.com>
 
 	* python/py-type.c (make_fielditem): Add gdb_assert_not_reached
diff --git a/gdb/python/py-event.c b/gdb/python/py-event.c
index afd07feca50..72d57cb8254 100644
--- a/gdb/python/py-event.c
+++ b/gdb/python/py-event.c
@@ -76,7 +76,7 @@ gdbpy_initialize_event_generic (PyTypeObject *type,
                                 char *name)
 {
   if (PyType_Ready (type) < 0)
-    goto fail;
+    return -1;
 
   Py_INCREF (type);
   if (PyModule_AddObject (gdb_module, name, (PyObject *) type) < 0)