diff --git a/lib/krb5/error_string.c b/lib/krb5/error_string.c
index db2df4798..ffe4aca2e 100644
--- a/lib/krb5/error_string.c
+++ b/lib/krb5/error_string.c
@@ -172,6 +172,9 @@ krb5_get_error_message(krb5_context context, krb5_error_code code)
     }
     HEIMDAL_MUTEX_unlock(context->mutex);
 
+    if (code == 0)
+	return strdup("Success");
+
     cstr = krb5_get_err_text(context, code);
     if (cstr)
 	return strdup(cstr);