diff --git a/lib/kadm5/init_c.c b/lib/kadm5/init_c.c
index c07a2b744..f67843b21 100644
--- a/lib/kadm5/init_c.c
+++ b/lib/kadm5/init_c.c
@@ -241,8 +241,10 @@ get_cred_cache(krb5_context context,
 	if(client != default_client) {
 	    krb5_free_principal(context, default_client);
 	    default_client = NULL;
-	    krb5_cc_close(context, id);
-	    id = NULL;
+	    if (id != NULL) {
+		krb5_cc_close(context, id);
+		id = NULL;
+	    }
 	}
     } else if(ccache != NULL)
 	id = ccache;