diff --git a/lib/gssapi/mech/gss_export_name.c b/lib/gssapi/mech/gss_export_name.c
index 0f22f529f..fd9320fac 100644
--- a/lib/gssapi/mech/gss_export_name.c
+++ b/lib/gssapi/mech/gss_export_name.c
@@ -37,18 +37,18 @@ gss_export_name(OM_uint32 *minor_status,
 	struct _gss_name *name = (struct _gss_name *) input_name;
 	struct _gss_mechanism_name *mn;
 
+	exported_name->value = NULL;
+	exported_name->length = 0;
+
 	/*
 	 * If this name already has any attached MNs, export the first
 	 * one, otherwise export based on the first mechanism in our
 	 * list.
 	 */
 	mn = SLIST_FIRST(&name->gn_mn);
-	if (!mn)
-		mn = _gss_find_mn(name,
-		    &SLIST_FIRST(&_gss_mechs)->gm_mech_oid);
 	if (!mn) {
 		*minor_status = 0;
-		return (GSS_S_BAD_MECH);
+		return (GSS_S_NAME_NOT_MN);
 	}
 
 	return mn->gmn_mech->gm_export_name(minor_status,