diff --git a/core/mac/src/pe/nan/nan_datapath.c b/core/mac/src/pe/nan/nan_datapath.c
index 030323ba2ed0..706f22ed76f9 100644
--- a/core/mac/src/pe/nan/nan_datapath.c
+++ b/core/mac/src/pe/nan/nan_datapath.c
@@ -722,11 +722,11 @@ void lim_process_ndi_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msgq,
 	tLimMlmStartCnf mlm_start_cnf;
 	tpAddBssParams add_bss_params = (tpAddBssParams) lim_msgq->bodyptr;
 
-	lim_log(mac_ctx, LOG1, FL("Status %d"), add_bss_params->status);
 	if (NULL == add_bss_params) {
 		lim_log(mac_ctx, LOGE, FL("Invalid body pointer in message"));
 		goto end;
 	}
+	lim_log(mac_ctx, LOG1, FL("Status %d"), add_bss_params->status);
 	if (QDF_STATUS_SUCCESS == add_bss_params->status) {
 		lim_log(mac_ctx, LOG1,
 		       FL("WDA_ADD_BSS_RSP returned QDF_STATUS_SUCCESS"));
diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c
index 390d66acda2f..3f2fa5321276 100644
--- a/core/wma/src/wma_power.c
+++ b/core/wma/src/wma_power.c
@@ -1949,11 +1949,13 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id)
 		uint32_t cfg_data_val = 0;
 		/* get mac to acess CFG data base */
 		struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
+		if (!mac) {
+			WMA_LOGE(FL("Failed to get mac context"));
+			return;
+		}
 		/* Set Listen Interval */
-		if ((NULL == mac) || (wlan_cfg_get_int(mac,
-						       WNI_CFG_LISTEN_INTERVAL,
-						       &cfg_data_val) !=
-				      eSIR_SUCCESS)) {
+		if ((wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
+				      &cfg_data_val) != eSIR_SUCCESS)) {
 			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for listen interval");
 			cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL;