diff --git a/kadmin/server.c b/kadmin/server.c
index dbd2f81b2..d1ed02b19 100644
--- a/kadmin/server.c
+++ b/kadmin/server.c
@@ -585,7 +585,8 @@ fail:
 	memset_s(password, len, 0, len);
 	free(password);
     }
-    krb5_storage_to_data(rsp, out);
+    if (ret == 0)
+	krb5_storage_to_data(rsp, out);
     krb5_storage_free(rsp);
     krb5_storage_free(sp);
     krb5_free_principal(contextp->context, princ);