diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 1eb75694f..a9f5a26e5 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -867,10 +867,11 @@ _krb5_pk_mk_padata(krb5_context context,
 	if (ret)
 	    goto out;
     } else {
+#if 0
 	ret = pk_mk_padata(context, COMPAT_19, ctx, req_body, nonce, md);
 	if (ret)
 	    goto out;
-
+#endif
 	ret = pk_mk_padata(context, COMPAT_27, ctx, req_body, nonce, md);
 	if (ret)
 	    goto out;
@@ -1859,10 +1860,13 @@ _krb5_pk_rd_pa_reply(krb5_context context,
 	    return ret;
 	default:
 	    free_PA_PK_AS_REP(&rep);
-	    krb5_set_error_string(context, "PKINIT: -25 reply "
+	    krb5_set_error_string(context, "PKINIT: -27 reply "
 				  "invalid content type");
+	    ret = EINVAL;
 	    break;
 	}
+	if (ret == 0)
+	    return ret;
     }
 
     /* Check for PK-INIT -19 */
@@ -1910,7 +1914,7 @@ _krb5_pk_rd_pa_reply(krb5_context context,
 					&w2krep,
 					&size);
 	if (ret) {
-	    krb5_set_error_string(context, "PKINIT: Failed decoding windows"
+	    krb5_set_error_string(context, "PKINIT: Failed decoding windows "
 				  "pkinit reply %d", ret);
 	    return ret;
 	}