diff --git a/lib/krb5/mk_priv.c b/lib/krb5/mk_priv.c
index 6cc9bf475..dcaf20a87 100644
--- a/lib/krb5/mk_priv.c
+++ b/lib/krb5/mk_priv.c
@@ -61,9 +61,9 @@ krb5_mk_priv(krb5_context context,
 
   /* XXX - Is this right? */
 
-  if (auth_context->local_subkey->keytype)
+  if (auth_context->local_subkey)
       key = auth_context->local_subkey;
-  else if (auth_context->remote_subkey->keytype)
+  else if (auth_context->remote_subkey)
       key = auth_context->remote_subkey;
   else
       key = auth_context->keyblock;
diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
index cb07b6b7c..3bde77a40 100644
--- a/lib/krb5/rd_priv.c
+++ b/lib/krb5/rd_priv.c
@@ -68,9 +68,9 @@ krb5_rd_priv(krb5_context context,
 
   /* XXX - Is this right? */
 
-  if (auth_context->local_subkey->keytype)
+  if (auth_context->local_subkey)
       key = auth_context->local_subkey;
-  else if (auth_context->remote_subkey->keytype)
+  else if (auth_context->remote_subkey)
       key = auth_context->remote_subkey;
   else
       key = auth_context->keyblock;