/* store it -- don't override */
        rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
        if( rc != 0 ) {
-               Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add 0x%lx: put failed: %s %d\n",
-                       e->e_id, db_strerror(rc), rc );
+               char buf[ SLAP_TEXT_BUFLEN ];
+               snprintf( buf, sizeof( buf ), "%s => bdb_dn2id_add dn=\"%s\" ID=0x%lx",
+                       op->o_log_prefix, e->e_name.bv_val, e->e_id );
+               Debug( LDAP_DEBUG_ANY, "%s: put failed: %s %d\n",
+                       buf, db_strerror(rc), rc );
                goto done;
        }
 
 
                                        attrs_free( e->e_attrs );
                                        e->e_attrs = save_attrs;
                                        Debug( LDAP_DEBUG_ANY,
-                                                  "Attribute index delete failure",
-                                                  0, 0, 0 );
+                                               "%s: attribute \"%s\" index delete failure\n",
+                                               op->o_log_prefix, ap->a_desc->ad_cname.bv_val, 0 );
                                        return rc;
                                }
                        }
                                attrs_free( e->e_attrs );
                                e->e_attrs = save_attrs;
                                Debug( LDAP_DEBUG_ANY,
-                                      "Attribute index add failure",
-                                      0, 0, 0 );
+                                      "%s: attribute \"%s\" index add failure\n",
+                                       op->o_log_prefix, ap->a_desc->ad_cname.bv_val, 0 );
                                return rc;
                        }
                }