diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index dce9b26e6..02396d9d0 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -1628,7 +1628,8 @@ _krb5_pk_load_id(krb5_context context,
     } else
 	*ret_id = id;
 
-    hx509_lock_free(lock);
+    if (lock)
+        hx509_lock_free(lock);
 
     return ret;
 }