diff --git a/orte/mca/rml/base/base.h b/orte/mca/rml/base/base.h
index 66d1c632a6..6b29d07f62 100644
--- a/orte/mca/rml/base/base.h
+++ b/orte/mca/rml/base/base.h
@@ -229,7 +229,7 @@ OBJ_CLASS_DECLARATION(orte_rml_recv_request_t);
                                 (m)->iov, (m)->count,                   \
                                 (m)->tag, (m)->cbdata);                 \
             }                                                           \
-        } else {                                                        \
+        } else if (NULL != (m)->cbfunc.buffer) {                        \
             /* non-blocking buffer send */                              \
             (m)->cbfunc.buffer((m)->status, &((m)->origin),             \
                                (m)->buffer,                             \