diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index 4473a4421..43c762b76 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -86,7 +86,8 @@ krb5_auth_con_free(krb5_context context,
 		   krb5_auth_context auth_context)
 {
     if (auth_context != NULL) {
-	krb5_free_authenticator(context, &auth_context->authenticator);
+	if (auth_context->authenticator)
+	    krb5_free_authenticator(context, &auth_context->authenticator);
 	if(auth_context->local_address){
 	    free_HostAddress(auth_context->local_address);
 	    free(auth_context->local_address);