diff --git a/lib/gssapi/mech/context.c b/lib/gssapi/mech/context.c
index 0f92ab59e..b5d4bd874 100644
--- a/lib/gssapi/mech/context.c
+++ b/lib/gssapi/mech/context.c
@@ -79,7 +79,7 @@ _gss_mg_get_error(const gss_OID mech, OM_uint32 type,
 
     switch (type) {
     case GSS_C_GSS_CODE: {
-	if (value != mg->maj_stat)
+	if (value != mg->maj_stat || mg->maj_error.length == 0)
 	    break;
 	string->value = malloc(mg->maj_error.length);
 	string->length = mg->maj_error.length;
@@ -87,7 +87,7 @@ _gss_mg_get_error(const gss_OID mech, OM_uint32 type,
 	return GSS_S_COMPLETE;
     }
     case GSS_C_MECH_CODE: {
-	if (value != mg->min_stat)
+	if (value != mg->min_stat || mg->min_error.length == 0)
 	    break;
 	string->value = malloc(mg->min_error.length);
 	string->length = mg->min_error.length;