diff --git a/ompi/mca/btl/ugni/btl_ugni_endpoint.c b/ompi/mca/btl/ugni/btl_ugni_endpoint.c
index de08417901..c2803bce3e 100644
--- a/ompi/mca/btl/ugni/btl_ugni_endpoint.c
+++ b/ompi/mca/btl/ugni/btl_ugni_endpoint.c
@@ -74,8 +74,6 @@ static inline int mca_btl_ugni_ep_smsg_get_mbox (mca_btl_base_endpoint_t *ep) {
 int mca_btl_ugni_ep_disconnect (mca_btl_base_endpoint_t *ep, bool send_disconnect) {
     int rc;
 
-    OPAL_THREAD_LOCK(&ep->common->lock);
-
     do {
         if (MCA_BTL_UGNI_EP_STATE_INIT == ep->state) {
             /* nothing to do */
@@ -101,8 +99,6 @@ int mca_btl_ugni_ep_disconnect (mca_btl_base_endpoint_t *ep, bool send_disconnec
         ep->mailbox = NULL;
     } while (0);
 
-    OPAL_THREAD_UNLOCK(&ep->common->lock);
-
     return OMPI_SUCCESS;
 }
 
diff --git a/ompi/mca/btl/ugni/btl_ugni_get.c b/ompi/mca/btl/ugni/btl_ugni_get.c
index fc6550cbb2..e96863b809 100644
--- a/ompi/mca/btl/ugni/btl_ugni_get.c
+++ b/ompi/mca/btl/ugni/btl_ugni_get.c
@@ -115,7 +115,7 @@ int mca_btl_ugni_start_eager_get (mca_btl_base_endpoint_t *ep,
         frag = NULL;
     }
 
-    BTL_VERBOSE(("starting eager get for remote ctx: %p", hdr.ctx));
+    BTL_VERBOSE(("starting eager get for remote ctx: %p", hdr.eager.ctx));
 
     do {
         if (NULL == frag) {