diff --git a/kdc/main.c b/kdc/main.c
index ccc6eeab5..68b28f60a 100644
--- a/kdc/main.c
+++ b/kdc/main.c
@@ -56,7 +56,9 @@ main(int argc, char **argv)
     setprogname(argv[0]);
     
     ret = krb5_init_context(&context);
-    if (ret)
+    if (ret == KRB5_CONFIG_BADFORMAT)
+	errx (1, "krb5_init_context failed to parse configuration file");
+    else if (ret)
 	errx (1, "krb5_init_context failed: %d", ret);
 
     configure(argc, argv);
diff --git a/kuser/kinit.c b/kuser/kinit.c
index 6cb1175db..2de03ee22 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -718,7 +718,9 @@ main (int argc, char **argv)
     setprogname (argv[0]);
     
     ret = krb5_init_context (&context);
-    if (ret)
+    if (ret == KRB5_CONFIG_BADFORMAT)
+	errx (1, "krb5_init_context failed to parse configuration file");
+    else if (ret)
 	errx(1, "krb5_init_context failed: %d", ret);
   
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))