diff --git a/lib/com_err/error.c b/lib/com_err/error.c
index c6add7727..ca95e40dd 100644
--- a/lib/com_err/error.c
+++ b/lib/com_err/error.c
@@ -10,7 +10,7 @@ krb5_get_err_text(krb5_context context, long code)
 	if(code >= p->table->base && code < p->table->base + p->table->n_msgs)
 	    return p->table->msgs[code - p->table->base];
     }
-    return "Error message not found";
+    return strerror(code);
 }
 
 void
diff --git a/lib/error/error.c b/lib/error/error.c
index c6add7727..ca95e40dd 100644
--- a/lib/error/error.c
+++ b/lib/error/error.c
@@ -10,7 +10,7 @@ krb5_get_err_text(krb5_context context, long code)
 	if(code >= p->table->base && code < p->table->base + p->table->n_msgs)
 	    return p->table->msgs[code - p->table->base];
     }
-    return "Error message not found";
+    return strerror(code);
 }
 
 void
diff --git a/lib/krb5/error/error.c b/lib/krb5/error/error.c
index c6add7727..ca95e40dd 100644
--- a/lib/krb5/error/error.c
+++ b/lib/krb5/error/error.c
@@ -10,7 +10,7 @@ krb5_get_err_text(krb5_context context, long code)
 	if(code >= p->table->base && code < p->table->base + p->table->n_msgs)
 	    return p->table->msgs[code - p->table->base];
     }
-    return "Error message not found";
+    return strerror(code);
 }
 
 void