diff --git a/ompi/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c
index 96618dac7c..dc8de72af6 100644
--- a/ompi/mca/btl/openib/btl_openib.c
+++ b/ompi/mca/btl/openib/btl_openib.c
@@ -582,7 +582,6 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
         
     MCA_BTL_IB_FRAG_ALLOC_RECV_USER(btl, frag, rc);
     if(NULL == frag) {
-        abort();
         return NULL;
     }
     
@@ -596,7 +595,6 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
                 frag->segment.seg_addr.pval, *size, 0, &registration);
         if(OMPI_SUCCESS != rc || NULL == registration) {
             MCA_BTL_IB_FRAG_RETURN(openib_btl, frag);
-            abort();
             return NULL;
         }
         /* keep track of the registration we did */
@@ -957,7 +955,6 @@ int mca_btl_openib_create_cq_srq(mca_btl_openib_module_t *openib_btl)
             openib_btl->qps[qp].u.srq_qp.srq =
                 ibv_create_srq(openib_btl->hca->ib_pd, &attr); 
             if (NULL == openib_btl->qps[qp].u.srq_qp.srq) { 
-                abort();
                 show_init_error(__FILE__, __LINE__, "ibv_create_srq",
                                 ibv_get_device_name(openib_btl->hca->ib_dev));
                 return OMPI_ERROR; 
diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c
index dfb6738522..d1782a1d04 100644
--- a/ompi/mca/btl/openib/btl_openib_component.c
+++ b/ompi/mca/btl/openib/btl_openib_component.c
@@ -1592,7 +1592,6 @@ static int btl_openib_module_progress(mca_btl_openib_module_t* openib_btl)
     return count;
 error:
     if(ne < 0){ 
-        abort();
         BTL_ERROR(("error polling %s with %d errno says %s\n",
                    cq_name[cq], ne, strerror(errno))); 
     } else {
@@ -1613,7 +1612,6 @@ error:
                         cq_name[cq],
                         btl_openib_component_status_to_string(wc.status), 
                         wc.status, wc.wr_id, wc.opcode, frag->qp_idx)); 
-            abort();
         }
         if(wc.status == IBV_WC_RETRY_EXC_ERR) { 
             opal_show_help("help-mpi-btl-openib.txt",
diff --git a/ompi/mca/btl/openib/btl_openib_endpoint.c b/ompi/mca/btl/openib/btl_openib_endpoint.c
index 37399788ae..8f76bd83b8 100644
--- a/ompi/mca/btl/openib/btl_openib_endpoint.c
+++ b/ompi/mca/btl/openib/btl_openib_endpoint.c
@@ -251,7 +251,6 @@ static inline int mca_btl_openib_endpoint_post_send(mca_btl_openib_module_t* ope
         }
         BTL_ERROR(("error posting send request error %d: %s\n", 
                    ib_rc, strerror(ib_rc))); 
-        abort();
         return OMPI_ERROR; 
     }
 #if 0
@@ -1155,7 +1154,6 @@ int mca_btl_openib_endpoint_create_qp(
     
         if(NULL == my_qp) { 
             BTL_ERROR(("error creating qp errno says %s", strerror(errno))); 
-            abort();
             return OMPI_ERROR; 
         }
         (*qp) = my_qp; 
diff --git a/ompi/mca/btl/openib/btl_openib_endpoint.h b/ompi/mca/btl/openib/btl_openib_endpoint.h
index fc130351db..cad3dcaea0 100644
--- a/ompi/mca/btl/openib/btl_openib_endpoint.h
+++ b/ompi/mca/btl/openib/btl_openib_endpoint.h
@@ -214,8 +214,9 @@ static inline int mca_btl_openib_endpoint_post_rr(mca_btl_base_endpoint_t *endpo
                                                   const int qp)
 {
     mca_btl_openib_module_t *openib_btl = endpoint->endpoint_btl;
-    int rd_num = mca_btl_openib_component.qp_infos[qp].rd_num;
     int rd_rsv = mca_btl_openib_component.qp_infos[qp].u.pp_qp.rd_rsv;
+    int rd_num = mca_btl_openib_component.qp_infos[qp].rd_num;
+        
     int cm_received, rd_posted, rd_low;
     
     assert(MCA_BTL_OPENIB_PP_QP == endpoint->qps[qp].qp_type);
@@ -258,7 +259,7 @@ static inline int mca_btl_openib_endpoint_post_rr(mca_btl_base_endpoint_t *endpo
             OPAL_THREAD_ADD32(&endpoint->qps[qp].u.pp_qp.cm_received,
                     -cm_received);
         }
-        assert(endpoint->qps[qp].u.pp_qp.rd_credits < rd_num);
+        assert(endpoint->qps[qp].u.pp_qp.rd_credits <= rd_num);
         assert(endpoint->qps[qp].u.pp_qp.rd_credits >= 0);
     }
     OPAL_THREAD_UNLOCK(&openib_btl->ib_lock);