diff --git a/nic/nic_cmd_event.c b/nic/nic_cmd_event.c
index 37adaaf..4fd07c9 100644
--- a/nic/nic_cmd_event.c
+++ b/nic/nic_cmd_event.c
@@ -3597,21 +3597,30 @@
 	struct PARAM_CMD_GET_TXPWR_TBL *prTxPwrTbl = NULL;
 	void *info_buf = NULL;
 
-	ASSERT(prAdapter);
-	ASSERT(prCmdInfo);
-	ASSERT(pucEventBuf);
-	ASSERT(prCmdInfo->pvInformationBuffer);
-
-	if (!prCmdInfo)
+	if (!prAdapter) {
+		DBGLOG(NIC, ERROR, "NULL prAdapter!\n");
 		return;
+	}
 
-	if (!prAdapter || !pucEventBuf || !prCmdInfo->pvInformationBuffer) {
+	if (!prCmdInfo) {
+		DBGLOG(NIC, ERROR, "NULL prCmdInfo!\n");
+		return;
+	}
+
+	if (!pucEventBuf || !prCmdInfo->pvInformationBuffer) {
 		if (prCmdInfo->fgIsOid) {
 			kalOidComplete(prAdapter->prGlueInfo,
 				       prCmdInfo->fgSetQuery,
 				       0,
 				       WLAN_STATUS_FAILURE);
 		}
+
+		if (!pucEventBuf)
+			DBGLOG(NIC, WARN, "NULL pucEventBuf!\n");
+
+		if (!prCmdInfo->pvInformationBuffer)
+			DBGLOG(NIC, WARN, "NULL pvInformationBuffer!\n");
+
 		return;
 	}
 
diff --git a/os/linux/gl_proc.c b/os/linux/gl_proc.c
index 4bba952..7afb708 100644
--- a/os/linux/gl_proc.c
+++ b/os/linux/gl_proc.c
@@ -730,8 +730,6 @@
 			case STREAM_MIMO:
 				kalStrnCpy(prefix, "mimo", sizeof(prefix));
 				break;
-			default:
-				break;
 			}
 
 			*pos += kalScnprintf(buf + *pos, TMP_SZ - *pos,
@@ -821,7 +819,7 @@
 	}
 
 	buffer = (char *) kalMemAlloc(buf_len, VIR_MEM_TYPE);
-	if (!buf)
+	if (!buffer)
 		return -ENOMEM;
 
 	for (i = 0; i < STREAM_NUM; i++) {