diff --git a/source/core/wifi_8021x.c b/source/core/wifi_8021x.c
index eb0fbfbf1..12c7692d1 100644
--- a/source/core/wifi_8021x.c
+++ b/source/core/wifi_8021x.c
@@ -53,6 +53,11 @@ void process_eap_data(wifi_8021x_data_t *data, wifi_8021x_t *module, bool new_ev
 
     gettimeofday(&tnow, NULL);
 
+    if (data == NULL || data->data == NULL) {
+        wifi_util_error_print(WIFI_MON, "%s:%d: NULL pointer encountered\n", __func__, __LINE__);
+        return;
+    }
+
     eap = (wifi_eap_frame_t *)data->data;
 
     to_mac_str(data->mac, mac_str);
@@ -67,10 +72,8 @@ void process_eap_data(wifi_8021x_data_t *data, wifi_8021x_t *module, bool new_ev
 
             wifi_util_dbg_print(WIFI_MON, "%s:%d: Removing from hash and deleting\n", __func__, __LINE__);
             hash_map_remove(module->bssid[data->vap].sta_map, mac_str);
-            if (data->data != NULL)
-                free(data->data);
-            if (data != NULL)
-                free(data);
+            free(data->data);
+            free(data);
         }
 
         return;