diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index e46b2bb92..f67389a74 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -1759,6 +1759,11 @@ _krb5_pk_load_id(krb5_context context,
 	goto out;
 
     ret = hx509_lock_init(id->hx509ctx, &lock);
+    if (ret) {
+	pk_copy_error(context, id->hx509ctx, ret, "Failed init lock");
+	goto out;
+    }
+
     if (password && password[0])
 	hx509_lock_add_password(lock, password);