diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
index f53105a2ba8..5719020bf14 100644
--- a/source/6LoWPAN/ws/ws_bootstrap.c
+++ b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -2700,9 +2700,13 @@ static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_
     if (result == AUTH_RESULT_OK) {
         tr_debug("authentication success");
         ws_bootstrap_event_configuration_start(cur);
-    } else if (result == AUTH_RESULT_ERR_TX_NO_ACK) {
+    } else {
         // eapol parent selected is not working
-        tr_debug("authentication TX failed");
+        if (result == AUTH_RESULT_ERR_TX_NO_ACK) {
+            tr_debug("authentication TX failed");
+        } else {
+            tr_debug("authentication failed");
+        }
 
         ws_bootstrap_candidate_parent_free(cur, target_eui_64);
         // Go back for network scanning
@@ -2715,12 +2719,6 @@ static void ws_bootstrap_authentication_completed(protocol_interface_info_entry_
         // Parent selection is made before imin/2 so if there is parent candidates solicit is not sent
         cur->bootsrap_state_machine_cnt = randLIB_get_random_in_range(10, cur->ws_info->trickle_params_pan_discovery.Imin >> 1);
         tr_info("Making parent selection in %u s", (cur->bootsrap_state_machine_cnt / 10));
-    } else {
-        tr_debug("authentication failed");
-        // What else to do to start over again...
-        // Trickle is reseted when entering to discovery from state 2
-        trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement_solicit, &cur->ws_info->trickle_params_pan_discovery);
-        ws_bootstrap_event_discovery_start(cur);
     }
 }
 
diff --git a/source/6LoWPAN/ws/ws_llc_data_service.c b/source/6LoWPAN/ws/ws_llc_data_service.c
index 1b2334e74e1..5d4ee19ce15 100644
--- a/source/6LoWPAN/ws/ws_llc_data_service.c
+++ b/source/6LoWPAN/ws/ws_llc_data_service.c
@@ -736,6 +736,7 @@ static void ws_llc_eapol_indication_cb(const mac_api_t *api, const mcps_data_ind
         //Allocate temporary entry
         ws_neighbor_temp_class_t *temp_entry = ws_allocate_eapol_temp_entry(base->temp_entries, data->SrcAddr);
         if (!temp_entry) {
+            tr_warn("EAPOL temp pool empty");
             return;
         }
         //Update Temporary Lifetime