diff --git a/utils/pktlog/linux_ac.c b/utils/pktlog/linux_ac.c
index b5264a8cd9..cafaf3a8f8 100644
--- a/utils/pktlog/linux_ac.c
+++ b/utils/pktlog/linux_ac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -165,7 +165,6 @@ void pktlog_release_buf(struct hif_opaque_softc *scn)
 	struct ath_pktlog_info *pl_info;
 
 	pl_dev = get_pktlog_handle();
-	pl_info = pl_dev->pl_info;
 
 	if (!pl_dev) {
 		qdf_print("%s: invalid pl_dev handle", __func__);
@@ -177,6 +176,8 @@ void pktlog_release_buf(struct hif_opaque_softc *scn)
 		return;
 	}
 
+	pl_info = pl_dev->pl_info;
+
 	page_cnt = ((sizeof(*(pl_info->buf)) + pl_info->buf_size) /
 		    PAGE_SIZE) + 1;
 
diff --git a/utils/pktlog/pktlog_ac.c b/utils/pktlog/pktlog_ac.c
index be1c86c1a2..688796b0ce 100644
--- a/utils/pktlog/pktlog_ac.c
+++ b/utils/pktlog/pktlog_ac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -82,6 +82,12 @@ void pktlog_set_callback_regtype(
 		enum pktlog_callback_regtype callback_type)
 {
 	struct pktlog_dev_t *pl_dev = get_pktlog_handle();
+
+	if (!pl_dev) {
+		qdf_print("Invalid pl_dev");
+		return;
+	}
+
 	pl_dev->callback_type = callback_type;
 }
 
diff --git a/utils/pktlog/pktlog_internal.c b/utils/pktlog/pktlog_internal.c
index 9f6676f968..8920283403 100644
--- a/utils/pktlog/pktlog_internal.c
+++ b/utils/pktlog/pktlog_internal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -657,6 +657,8 @@ A_STATUS process_rx_info(void *pdev, void *data)
 
 	pl_info = pl_dev->pl_info;
 	pl_tgt_hdr = (uint32_t *) data;
+
+	qdf_mem_set(&pl_hdr, sizeof(pl_hdr), 0);
 	pl_hdr.flags = (*(pl_tgt_hdr + ATH_PKTLOG_HDR_FLAGS_OFFSET) &
 			ATH_PKTLOG_HDR_FLAGS_MASK) >>
 		       ATH_PKTLOG_HDR_FLAGS_SHIFT;
@@ -716,6 +718,8 @@ A_STATUS process_rate_find(void *pdev, void *data)
 	 * Makes the short words (16 bits) portable b/w little endian
 	 * and big endian
 	 */
+
+	qdf_mem_set(&pl_hdr, sizeof(pl_hdr), 0);
 	pl_hdr.flags = (*(pl_tgt_hdr + ATH_PKTLOG_HDR_FLAGS_OFFSET) &
 			ATH_PKTLOG_HDR_FLAGS_MASK) >>
 		       ATH_PKTLOG_HDR_FLAGS_SHIFT;
@@ -730,6 +734,7 @@ A_STATUS process_rate_find(void *pdev, void *data)
 			   ATH_PKTLOG_HDR_MAC_ID_MASK) >>
 			  ATH_PKTLOG_HDR_MAC_ID_SHIFT;
 	pl_hdr.flags |= PKTLOG_HDR_SIZE_16;
+
 #else
 	pl_hdr.log_type = (*(pl_tgt_hdr + ATH_PKTLOG_HDR_LOG_TYPE_OFFSET) &
 			   ATH_PKTLOG_HDR_LOG_TYPE_MASK) >>
@@ -845,6 +850,7 @@ A_STATUS process_rate_update(void *pdev, void *data)
 	 * Makes the short words (16 bits) portable b/w little endian
 	 * and big endian
 	 */
+	qdf_mem_set(&pl_hdr, sizeof(pl_hdr), 0);
 	pl_hdr.flags = (*(pl_tgt_hdr + ATH_PKTLOG_HDR_FLAGS_OFFSET) &
 			ATH_PKTLOG_HDR_FLAGS_MASK) >>
 		       ATH_PKTLOG_HDR_FLAGS_SHIFT;
@@ -895,6 +901,7 @@ int process_rx_desc_remote(void *pdev, void *data)
 	qdf_nbuf_t log_nbuf = (qdf_nbuf_t)data;
 
 	pl_info = pl_dev->pl_info;
+	qdf_mem_set(&pl_hdr, sizeof(pl_hdr), 0);
 	pl_hdr.flags = (1 << PKTLOG_FLG_FRM_TYPE_REMOTE_S);
 	pl_hdr.missed_cnt = 0;
 	pl_hdr.log_type = 22; /*PKTLOG_TYPE_RX_STATBUF*/
@@ -927,6 +934,7 @@ process_pktlog_lite(void *context, void *log_data, uint16_t log_type)
 	qdf_nbuf_t log_nbuf = (qdf_nbuf_t)log_data;
 
 	pl_info = pl_dev->pl_info;
+	qdf_mem_set(&pl_hdr, sizeof(pl_hdr), 0);
 	pl_hdr.flags = (1 << PKTLOG_FLG_FRM_TYPE_REMOTE_S);
 	pl_hdr.missed_cnt = 0;
 	pl_hdr.log_type = log_type;