diff --git a/admin/change.c b/admin/change.c
index 120ea9570..b359c403e 100644
--- a/admin/change.c
+++ b/admin/change.c
@@ -158,7 +158,7 @@ kt_change (int argc, char **argv)
 
     ret = krb5_kt_start_seq_get(context, keytab, &cursor);
     if(ret){
-	krb5_warn(context, ret, "krb5_kt_start_seq_get");
+	krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
 	return 1;
     }
 
diff --git a/admin/copy.c b/admin/copy.c
index 3496555d8..ecea49406 100644
--- a/admin/copy.c
+++ b/admin/copy.c
@@ -89,7 +89,7 @@ kt_copy (int argc, char **argv)
 
     ret = krb5_kt_start_seq_get (context, src_keytab, &cursor);
     if (ret) {
-	krb5_warn (context, ret, "krb5_kt_start_seq_get");
+	krb5_warn (context, ret, "krb5_kt_start_seq_get %s", keytab_string);
 	goto fail;
     }
 
diff --git a/admin/ktutil.c b/admin/ktutil.c
index 0c4d4c3e5..90fc25c34 100644
--- a/admin/ktutil.c
+++ b/admin/ktutil.c
@@ -40,6 +40,8 @@ static int version_flag;
 int verbose_flag;
 char *keytab_string; 
 
+static char keytab_buf[256];
+
 static int help(int argc, char **argv);
 
 static SL_cmd cmds[] = {
@@ -143,6 +145,10 @@ main(int argc, char **argv)
     if(keytab_string) {
 	ret = krb5_kt_resolve(context, keytab_string, &keytab);
     } else {
+	if(krb5_kt_default_name (context, keytab_buf, sizeof(keytab_buf)))
+	    strlcpy (keytab_buf, "unknown");
+	keytab_string = keytab_buf;
+
 	ret = krb5_kt_default(context, &keytab);
     }
     if(ret)
diff --git a/admin/list.c b/admin/list.c
index 4aac2f8ac..181f28af7 100644
--- a/admin/list.c
+++ b/admin/list.c
@@ -44,7 +44,7 @@ kt_list(int argc, char **argv)
 
     ret = krb5_kt_start_seq_get(context, keytab, &cursor);
     if(ret){
-	krb5_warn(context, ret, "krb5_kt_start_seq_get");
+	krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
 	return 1;
     }
     printf("%s", "Version");
diff --git a/admin/purge.c b/admin/purge.c
index 72df2c896..c88afe829 100644
--- a/admin/purge.c
+++ b/admin/purge.c
@@ -126,7 +126,7 @@ kt_purge(int argc, char **argv)
 
     ret = krb5_kt_start_seq_get(context, keytab, &cursor);
     if(ret){
-	krb5_warn(context, ret, "krb5_kt_start_seq_get");
+	krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
 	return 1;
     }
 
@@ -140,7 +140,7 @@ kt_purge(int argc, char **argv)
 
     ret = krb5_kt_start_seq_get(context, keytab, &cursor);
     if(ret){
-	krb5_warn(context, ret, "krb5_kt_start_seq_get");
+	krb5_warn(context, ret, "krb5_kt_start_seq_get, %s", keytab_string);
 	return 1;
     }
 
diff --git a/admin/srvcreate.c b/admin/srvcreate.c
index 03a64c204..2b6251be9 100644
--- a/admin/srvcreate.c
+++ b/admin/srvcreate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -83,7 +83,7 @@ srvcreate(int argc, char **argv)
 
     ret = krb5_kt_start_seq_get(context, keytab, &cursor);
     if(ret){
-        krb5_warn(context, ret, "krb5_kt_start_seq_get");
+        krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
         return 1;
     }