diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index 4159f05e0..361809177 100644
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -110,6 +110,8 @@ add_padata(krb5_context context,
     if(salt == NULL) {
 	/* default to standard salt */
 	ret = krb5_get_pw_salt (context, client, &salt2);
+	if (ret)
+	    return ret;
 	salt = &salt2;
     }
     if (!enctypes) {