diff --git a/lib/hdb/mkey.c b/lib/hdb/mkey.c
index 3e772bb06..895f78f58 100644
--- a/lib/hdb/mkey.c
+++ b/lib/hdb/mkey.c
@@ -147,12 +147,8 @@ read_master_keytab(krb5_context context, const char *filename,
   out:
     krb5_kt_close(context, id);
     if (ret) {
-	/* do not return allocated memory on failure */
-	do {
-	    p = (*mkey)->next;
-	    free(*mkey);
-	    *mkey = p;
-	} while (p != NULL);
+	hdb_free_master_key(context, *mkey);
+	*mkey = NULL;
     }
     return ret;
 }