diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
index f8eb5a737..34786d8b2 100644
--- a/lib/krb5/cache.c
+++ b/lib/krb5/cache.c
@@ -1211,8 +1211,8 @@ krb5_cc_set_config(krb5_context context, krb5_ccache id,
 
     /* Remove old configuration */
     ret = krb5_cc_remove_cred(context, id, 0, &cred);
-    if (ret)
-	goto out;
+    if (ret != KRB5_CC_NOTFOUND)
+        goto out;
 
     /* not that anyone care when this expire */
     cred.times.authtime = time(NULL);