diff --git a/lib/gssapi/mech/gss_display_status.c b/lib/gssapi/mech/gss_display_status.c
index 3681de6a4..2df25edbc 100644
--- a/lib/gssapi/mech/gss_display_status.c
+++ b/lib/gssapi/mech/gss_display_status.c
@@ -148,9 +148,13 @@ gss_display_status(OM_uint32 *minor_status,
 {
 	OM_uint32 major_status;
 
+	_mg_buffer_zero(status_string);
+	*message_content = 0;
+
 	major_status = _gss_mg_get_error(mech_type, status_type,
 					 status_value, status_string);
 	if (major_status == GSS_S_COMPLETE) {
+
 	    *message_content = 0;
 	    *minor_status = 0;
 	    return GSS_S_COMPLETE;
@@ -203,7 +207,6 @@ gss_display_status(OM_uint32 *minor_status,
 		return GSS_S_COMPLETE;
 	}
 	}
-	status_string->value = NULL;
-	status_string->length = 0;
+	_mg_buffer_zero(status_string);
 	return (GSS_S_BAD_STATUS);
 }
diff --git a/lib/gssapi/mech/gss_duplicate_name.c b/lib/gssapi/mech/gss_duplicate_name.c
index 0346616be..813acfe20 100644
--- a/lib/gssapi/mech/gss_duplicate_name.c
+++ b/lib/gssapi/mech/gss_duplicate_name.c
@@ -39,6 +39,7 @@ OM_uint32 gss_duplicate_name(OM_uint32 *minor_status,
 	struct _gss_mechanism_name *mn;
 
 	*minor_status = 0;
+	*dest_name = GSS_C_NO_NAME;
 
 	/*
 	 * If this name has a value (i.e. it didn't come from