diff --git a/lib/hdb/ext.c b/lib/hdb/ext.c
index faf0b6bdf..a8a882c6b 100644
--- a/lib/hdb/ext.c
+++ b/lib/hdb/ext.c
@@ -281,7 +281,6 @@ hdb_entry_get_password(krb5_context context, HDB *db,
 		       const hdb_entry *entry, char **p)
 {
     HDB_extension *ext;
-    char *str;
     int ret;
 
     ext = hdb_find_extension(entry, choice_HDB_extension_data_password);
@@ -330,14 +329,17 @@ hdb_entry_get_password(krb5_context context, HDB *db,
 	return 0;
     }
 
-    ret = krb5_unparse_name(context, entry->principal, &str);
-    if (ret == 0) {
-	krb5_set_error_message(context, ENOENT, "no password attributefor %s", str);
-	free(str);
-    } else
-	krb5_clear_error_message(context);
-
-    return ENOENT;
+    {
+	char *name;
+	ret = krb5_unparse_name(context, entry->principal, &name);
+	if (ret == 0) {
+	    krb5_set_error_message(context, ENOENT, "no password attributefor %s", name);
+	    free(name);
+	} else
+	    krb5_clear_error_message(context);
+	
+	return ENOENT;
+    }
 }
 
 int