diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index db7287d7f..83e55a6c4 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -2769,6 +2769,7 @@ _kdc_as_rep(astgs_request_t r)
     }
 
 out:
+    r->ret = ret;
     notify_hdb_audit(r);
 
     /*
@@ -2779,7 +2780,7 @@ out:
 				 r->rep.padata,
 			         r->armor_crypto,
 			         &req->req_body,
-			         r->ret = ret,
+			         r->ret,
 			         r->client_princ,
 			         r->server_princ,
 			         NULL, NULL,
diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 14db53ab4..e0e4102c7 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -2574,6 +2574,8 @@ _kdc_tgs_rep(astgs_request_t r)
     }
 
 out:
+    r->ret = ret;
+
     if(ret && ret != HDB_ERR_NOT_FOUND_HERE && data->data == NULL){
 	METHOD_DATA error_method = { 0, NULL };
 
@@ -2582,7 +2584,7 @@ out:
 				 &error_method,
 				 r->armor_crypto,
 				 &req->req_body,
-				 r->ret = ret,
+				 r->ret,
 				 ticket != NULL ? ticket->client : NULL,
 				 ticket != NULL ? ticket->server : NULL,
 				 csec, cusec,