diff --git a/ompi/mca/btl/sm/btl_sm.c b/ompi/mca/btl/sm/btl_sm.c
index f4398f6490..6028c0be2d 100644
--- a/ompi/mca/btl/sm/btl_sm.c
+++ b/ompi/mca/btl/sm/btl_sm.c
@@ -791,11 +791,10 @@ int mca_btl_sm_sendi( struct mca_btl_base_module_t* btl,
  * @param btl (IN)      BTL module
  * @param peer (IN)     BTL peer addressing
  */
-int mca_btl_sm_send(
-    struct mca_btl_base_module_t* btl,
-    struct mca_btl_base_endpoint_t* endpoint,
-    struct mca_btl_base_descriptor_t* descriptor,
-    mca_btl_base_tag_t tag)
+int mca_btl_sm_send( struct mca_btl_base_module_t* btl,
+                     struct mca_btl_base_endpoint_t* endpoint,
+                     struct mca_btl_base_descriptor_t* descriptor,
+                     mca_btl_base_tag_t tag )
 {
     mca_btl_sm_frag_t* frag = (mca_btl_sm_frag_t*)descriptor;
     int rc;
diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c
index 17e4e33306..bba99d346b 100644
--- a/ompi/mca/btl/sm/btl_sm_component.c
+++ b/ompi/mca/btl/sm/btl_sm_component.c
@@ -56,12 +56,9 @@
 #include "btl_sm_frag.h"
 #include "btl_sm_fifo.h"
 
-
-
 /*
  * Shared Memory (SM) component instance.
  */
-
 mca_btl_sm_component_t mca_btl_sm_component = {
     {  /* super is being filled in */
         /* First, the mca_base_component_t struct containing meta information
diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
index ef8f75359f..c75555c35f 100644
--- a/ompi/mca/pml/ob1/pml_ob1_sendreq.c
+++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
@@ -568,13 +568,13 @@ int mca_pml_ob1_send_request_start_copy( mca_pml_ob1_send_request_t* sendreq,
         return OMPI_SUCCESS;
     }
     switch(rc) {
-    case OMPI_ERR_RESOURCE_BUSY:
-        /* don't signal request completion; will be completed in wait() */
-        rc = OMPI_SUCCESS;
-        break;
-    default:
-        mca_bml_base_free(bml_btl, des);
-        break;
+        case OMPI_ERR_RESOURCE_BUSY:
+            /* No more resources. Allow the upper level to queue the send */
+            rc = OMPI_ERR_OUT_OF_RESOURCE;
+            break;
+        default:
+            mca_bml_base_free(bml_btl, des);
+            break;
     }
     return rc;
 }