diff --git a/Objects/classobject.c b/Objects/classobject.c
index 8ee13444b8d..4fb1167489e 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -592,7 +592,10 @@ instance_getattr1(inst, name)
 	if (v == NULL) {
 		v = class_lookup(inst->in_class, name, &class);
 		if (v == NULL) {
-			PyErr_SetObject(PyExc_AttributeError, name);
+			PyErr_Format(PyExc_AttributeError,
+				     "'%.50s' instance has no attribute '%.400s'",
+				     PyString_AsString(inst->in_class->cl_name),
+				     sname);
 			return NULL;
 		}
 	}