diff --git a/lib/krb5/get_for_creds.c b/lib/krb5/get_for_creds.c
index cea753e47..ad8cb6221 100644
--- a/lib/krb5/get_for_creds.c
+++ b/lib/krb5/get_for_creds.c
@@ -63,9 +63,10 @@ add_addrs(krb5_context context,
     }
     for (a = ai; a != NULL; a = a->ai_next) {
 	ret = krb5_sockaddr2address (a->ai_addr, &addr->val[i++]);
-	if (ret)
+	if (ret != 0 && ret != KRB5_PROG_ATYPE_NOSUPP)
 	    goto fail;
     }
+    addr->len = i;
     return 0;
 fail:
     krb5_free_addresses (context, addr);