diff --git a/lib/gssapi/display_status.c b/lib/gssapi/display_status.c
index d88a58034..7764f7a4c 100644
--- a/lib/gssapi/display_status.c
+++ b/lib/gssapi/display_status.c
@@ -129,21 +129,25 @@ OM_uint32 gss_display_status
       asprintf (&buf, "%s %s",
 		calling_error(GSS_CALLING_ERROR(status_value)),
 		routine_error(GSS_ROUTINE_ERROR(status_value)));
-      if (buf == NULL) {
-	  *minor_status = ENOMEM;
-	  return GSS_S_FAILURE;
-      }
   } else if (status_type == GSS_C_MECH_CODE) {
       buf = gssapi_krb5_get_error_string ();
-      if (buf == NULL)
-	  buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value));
       if (buf == NULL) {
-	  *minor_status = ENOMEM;
-	  return GSS_S_FAILURE;
+	  const char *tmp = krb5_get_err_text (gssapi_krb5_context,
+					       status_value);
+	  if (tmp == NULL)
+	      asprintf(&buf, "unknown mech error-code %u",
+		       (unsigned)status_value);
+	  else
+	      buf = strdup(tmp);
       }
   } else
       return GSS_S_BAD_STATUS;
 
+  if (buf == NULL) {
+      *minor_status = ENOMEM;
+      return GSS_S_FAILURE;
+  }
+
   *message_context = 0;
 
   status_string->length = strlen(buf);
diff --git a/lib/gssapi/krb5/display_status.c b/lib/gssapi/krb5/display_status.c
index d88a58034..7764f7a4c 100644
--- a/lib/gssapi/krb5/display_status.c
+++ b/lib/gssapi/krb5/display_status.c
@@ -129,21 +129,25 @@ OM_uint32 gss_display_status
       asprintf (&buf, "%s %s",
 		calling_error(GSS_CALLING_ERROR(status_value)),
 		routine_error(GSS_ROUTINE_ERROR(status_value)));
-      if (buf == NULL) {
-	  *minor_status = ENOMEM;
-	  return GSS_S_FAILURE;
-      }
   } else if (status_type == GSS_C_MECH_CODE) {
       buf = gssapi_krb5_get_error_string ();
-      if (buf == NULL)
-	  buf = strdup(krb5_get_err_text (gssapi_krb5_context, status_value));
       if (buf == NULL) {
-	  *minor_status = ENOMEM;
-	  return GSS_S_FAILURE;
+	  const char *tmp = krb5_get_err_text (gssapi_krb5_context,
+					       status_value);
+	  if (tmp == NULL)
+	      asprintf(&buf, "unknown mech error-code %u",
+		       (unsigned)status_value);
+	  else
+	      buf = strdup(tmp);
       }
   } else
       return GSS_S_BAD_STATUS;
 
+  if (buf == NULL) {
+      *minor_status = ENOMEM;
+      return GSS_S_FAILURE;
+  }
+
   *message_context = 0;
 
   status_string->length = strlen(buf);