diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index b7979f0da..c36c9f634 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -379,7 +379,8 @@ krb5_rd_req(krb5_context context,
 				  server,
 				  keytab,
 				  &keyblock);
-	goto out;
+	if(ret)
+	    goto out;
     }
 	
 
@@ -394,8 +395,8 @@ krb5_rd_req(krb5_context context,
     if(keyblock != NULL)
 	krb5_free_keyblock(context, keyblock);
 
-    free_AP_REQ(&ap_req);
 out:
+    free_AP_REQ(&ap_req);
     if(service)
 	krb5_free_principal(context, service);
     return ret;