diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 1dd231dc7e..705209469c 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5479,7 +5479,7 @@ unsigned menu_displaylist_build_list(
                   {
                      const char *ssid = scan->net_list[i].ssid;
                      if (menu_entries_append_enum(list,
-                              strlen(ssid) ? ssid : msg_hash_to_str(MSG_WIFI_EMPTY_SSID),
+                              string_is_empty(ssid) ? msg_hash_to_str(MSG_WIFI_EMPTY_SSID) : ssid,
                               msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_WIFI),
                               MENU_ENUM_LABEL_CONNECT_WIFI,
                               MENU_WIFI, 0, 0))
diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c
index 72af83c6ce..5ac5e4ae66 100644
--- a/tasks/task_wifi.c
+++ b/tasks/task_wifi.c
@@ -44,6 +44,9 @@
 
 static void task_wifi_scan_handler(retro_task_t *task)
 {
+   if (!task)
+      return;
+
    driver_wifi_scan();
 
    task_set_progress(task, 100);
@@ -54,6 +57,9 @@ static void task_wifi_scan_handler(retro_task_t *task)
 
 static void task_wifi_enable_handler(retro_task_t *task)
 {
+   if (!task)
+      return;
+
    driver_wifi_enable(true);
 
    task_set_progress(task, 100);
@@ -62,6 +68,9 @@ static void task_wifi_enable_handler(retro_task_t *task)
 
 static void task_wifi_disable_handler(retro_task_t *task)
 {
+   if (!task)
+      return;
+
    driver_wifi_enable(false);
 
    task_set_progress(task, 100);
@@ -70,6 +79,9 @@ static void task_wifi_disable_handler(retro_task_t *task)
 
 static void task_wifi_disconnect_handler(retro_task_t *task)
 {
+   if (!task)
+      return;
+
    wifi_network_info_t netinfo;
 
    if (driver_wifi_connection_info(&netinfo))
@@ -81,7 +93,11 @@ static void task_wifi_disconnect_handler(retro_task_t *task)
 
 static void task_wifi_connect_handler(retro_task_t *task)
 {
+   if (!task)
+      return;
+
    driver_wifi_connect_ssid(task->user_data);
+   free(task->user_data);
 
    task_set_progress(task, 100);
    task_set_finished(task, true);