"slap_modrdn2modlist: access to attr \"%s\" "
                                "(new) not allowed\n", 
                                new_rdn[ a_cnt ]->la_attr.bv_val, 0, 0 );
+                       rs->sr_text = "access to naming attributes (new) not allowed";
                        rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                        goto done;
                }
                                        "to attr \"%s\" (old) not allowed\n", 
                                        old_rdn[ d_cnt ]->la_attr.bv_val,
                                        0, 0 );
+                               rs->sr_text = "access to naming attributes (old) not allowed";
                                rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                                goto done;
                        }
        
 done:
 
-       if ( !repl_user ) {
+       if ( rs->sr_err == LDAP_SUCCESS && !repl_user ) {
                char textbuf[ SLAP_TEXT_BUFLEN ];
                size_t textlen = sizeof textbuf;