diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 4ba24036b7a5..10011aa2f2f3 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -1995,7 +1995,10 @@ CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle,
 		goto fail;
 
 	pdev = cds_get_context(CDF_MODULE_ID_TXRX);
-	ol_txrx_set_wmm_param(pdev, ol_tx_wmm_param);
+	if (pdev)
+		ol_txrx_set_wmm_param(pdev, ol_tx_wmm_param);
+	else
+		CDF_ASSERT(0);
 
 	return CDF_STATUS_SUCCESS;
 
diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c
index 15d321202aab..1fde2f276829 100644
--- a/core/wma/src/wma_ocb.c
+++ b/core/wma/src/wma_ocb.c
@@ -64,6 +64,8 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status)
 			    req->channel_count;
 			vdev->ocb_channel_info =
 				cdf_mem_malloc(buf_size);
+			if (!vdev->ocb_channel_info)
+				return -ENOMEM;
 			cdf_mem_zero(vdev->ocb_channel_info, buf_size);
 			for (i = 0; i < req->channel_count; i++) {
 				vdev->ocb_channel_info[i].chan_freq =