diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c
index ac0248359..1154cbe42 100644
--- a/lib/krb5/get_cred.c
+++ b/lib/krb5/get_cred.c
@@ -176,7 +176,7 @@ krb5_get_kdc_cred(krb5_context context,
 	if(ret == 0 && rep.part2.nonce != req.req_body.nonce)
 	    ret = KRB5KRB_AP_ERR_MODIFIED;
 	krb5_free_kdc_rep(context, &rep);
-    }else if(decode_KRB_ERROR(resp.data, resp.length, &error, &len) == 0){
+    }else if(krb5_rd_error(context, &resp, &error) == 0){
 #if 0
 	krb5_principal princ;
 	char *name;
@@ -190,7 +190,7 @@ krb5_get_kdc_cred(krb5_context context,
 		    krb5_get_err_text(context, error.error_code));
 	fprintf(stderr, " (code %d)\n", error.error_code);
 #endif
-	ret = error.error_code + KRB5KDC_ERR_NONE;
+	ret = error.error_code;
 	free_KRB_ERROR(&error);
     }else
 	ret = KRB5KRB_AP_ERR_MSG_TYPE;
diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index 4fdc13149..a9a199906 100644
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -358,7 +358,7 @@ krb5_get_in_tkt(krb5_context context,
 	KRB_ERROR error;
 	int ret2;
 
-	ret2 = decode_KRB_ERROR(resp.data, resp.length, &error, &size);
+	ret2 = krb5_rd_error(context, &resp, &error);
 	krb5_data_free(&resp);
 	if (ret2 == 0) {
 	    /* XXX */
@@ -366,7 +366,7 @@ krb5_get_in_tkt(krb5_context context,
 		fprintf (stderr,
 			 "get_in_tkt: KRB_ERROR: %s\n", *(error.e_text));
 	    free_KRB_ERROR (&error);
-	    return error.error_code + KRB5KDC_ERR_NONE;
+	    return error.error_code;
 	}
 	return ret;
     }