diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 2f79be192..420328914 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -2285,8 +2285,7 @@ out:
 
     free_EncTicketPart(&adtkt);
 
-    if (mspac)
-	krb5_pac_free(context, mspac);
+    krb5_pac_free(context, mspac);
 
     return ret;
 }
diff --git a/lib/krb5/pac.c b/lib/krb5/pac.c
index ad2c9e17e..668ec78c5 100644
--- a/lib/krb5/pac.c
+++ b/lib/krb5/pac.c
@@ -441,6 +441,8 @@ krb5_pac_get_types(krb5_context context,
 KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_pac_free(krb5_context context, krb5_pac pac)
 {
+    if (pac == NULL)
+	return;
     krb5_data_free(&pac->data);
     krb5_data_free(&pac->ticket_sign_data);
     free(pac->pac);