diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index 43566c3e2..3a67db425 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -1086,7 +1086,6 @@ _kdc_encode_reply(krb5_context context,
 		  int skvno, const EncryptionKey *skey,
 		  int ckvno,
 		  int rk_is_subkey,
-		  const char **e_text,
 		  krb5_data *reply)
 {
     unsigned char *buf;
@@ -1215,7 +1214,7 @@ _kdc_encode_reply(krb5_context context,
     if(buf_size != len) {
 	free(buf);
 	kdc_log(context, config, 4, "Internal error in ASN.1 encoder");
-	*e_text = "KDC internal error";
+	_kdc_set_e_text(r, "KDC internal error");
 	return KRB5KRB_ERR_GENERIC;
     }
     ret = krb5_crypto_init(context, &r->reply_key, 0, &crypto);
@@ -1257,7 +1256,7 @@ _kdc_encode_reply(krb5_context context,
     if(buf_size != len) {
 	free(buf);
 	kdc_log(context, config, 4, "Internal error in ASN.1 encoder");
-	*e_text = "KDC internal error";
+	_kdc_set_e_text(r, "KDC internal error");
 	return KRB5KRB_ERR_GENERIC;
     }
     reply->data = buf;
@@ -2755,7 +2754,7 @@ _kdc_as_rep(astgs_request_t r)
 			    r, req->req_body.nonce, setype,
 			    r->server->entry.kvno, &skey->key,
 			    pa_used_flag_isset(r, PA_REPLACE_REPLY_KEY) ? 0 : r->client->entry.kvno,
-			    0, &r->e_text, r->reply);
+			    0, r->reply);
     if (ret)
 	goto out;
 
diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 353004edd..831a377ce 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -603,7 +603,6 @@ tgs_make_reply(astgs_request_t r,
 	       krb5_boolean add_ticket_sig)
 {
     KDC_REQ_BODY *b = &r->req.req_body;
-    const char **e_text = &r->e_text;
     krb5_data *reply = r->reply;
     KDC_REP *rep = &r->rep;
     EncTicketPart *et = &r->et;
@@ -845,8 +844,7 @@ tgs_make_reply(astgs_request_t r,
        DES3? */
     ret = _kdc_encode_reply(r->context, r->config, r, b->nonce,
 			    serverkey->keytype, kvno,
-			    serverkey, 0, r->rk_is_subkey,
-			    e_text, reply);
+			    serverkey, 0, r->rk_is_subkey, reply);
     if (is_weak)
 	krb5_enctype_disable(r->context, serverkey->keytype);