diff --git a/lib/gssapi/mech/gss_inquire_context.c b/lib/gssapi/mech/gss_inquire_context.c
index c086d9585..e9c78d1af 100644
--- a/lib/gssapi/mech/gss_inquire_context.c
+++ b/lib/gssapi/mech/gss_inquire_context.c
@@ -79,7 +79,8 @@ gss_inquire_context(OM_uint32 *minor_status,
 	if (src_name) {
 		name = _gss_make_name(m, src_mn);
 		if (!name) {
-			*mech_type = GSS_C_NO_OID;
+			if (mech_type)
+				*mech_type = GSS_C_NO_OID;
 			m->gm_release_name(minor_status, &src_mn);
 			*minor_status = 0;
 			return (GSS_S_FAILURE);
@@ -90,8 +91,10 @@ gss_inquire_context(OM_uint32 *minor_status,
 	if (targ_name) {
 		name = _gss_make_name(m, targ_mn);
 		if (!name) {
-			*mech_type = GSS_C_NO_OID;
-			gss_release_name(minor_status, src_name);
+			if (mech_type)
+				*mech_type = GSS_C_NO_OID;
+			if (src_name)
+				gss_release_name(minor_status, src_name);
 			m->gm_release_name(minor_status, &targ_mn);
 			*minor_status = 0;
 			return (GSS_S_FAILURE);