b/opensm/osm_congestion_control.c
@@ -626,6 +626,11 @@ static void cc_mad_recv_callback(osm_madw_t *
p_madw, void *bind_context,
OSM_LOG_ENTER(p_cc->log);
+ CL_ASSERT(p_madw);
+
+ /* HACK - should be extended when supporting CC traps */
+ CL_ASSERT(p_req_madw != NULL);
+
osm_madw_copy_context(p_madw, p_req_madw);
osm_mad_pool_put(p_cc->mad_pool, p_req_madw);
diff --git a/opensm/osm_perfmgr.c b/opensm/osm_perfmgr.c
@@ -175,6 +175,9 @@ static void perfmgr_mad_recv_callback(osm_madw_t *
p_madw, void *bind_context,
OSM_LOG_ENTER(pm->log);
+ CL_ASSERT(p_madw);
+ CL_ASSERT(p_req_madw != NULL);
+
osm_madw_copy_context(p_madw, p_req_madw);
osm_mad_pool_put(pm->mad_pool, p_req_madw);
-- 1.7.8.2