diff --git a/command_event.c b/command_event.c
index 1b3314283e..4fda64f26d 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1206,7 +1206,7 @@ bool event_command(enum event_command cmd)
             if (menu)
                menu->load_no_content = false;
 #endif
-            rarch_main_data_deinit();
+            rarch_main_data_clear_state();
 
             rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_CONTENT_PATH, NULL);
 
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 043e8a6066..33e5258bf9 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -621,17 +621,9 @@ static void rarch_task_overlay_handler(rarch_task_t *task)
       case OVERLAY_STATUS_DEFERRED_LOADING_RESOLVE:
          rarch_task_overlay_resolve_iterate(loader);
          break;
-      case OVERLAY_STATUS_DEFERRED_DONE:
-#if 0
-         input_overlay_new_done();
-         break;
-#endif
       case OVERLAY_STATUS_DEFERRED_ERROR:
-#if 0
-         input_overlay_free();
-         break;
-#endif
-         break;
+         task->error = strdup("Failed to load the overlay.");
+      case OVERLAY_STATUS_DEFERRED_DONE:
       default:
       case OVERLAY_STATUS_NONE:
          goto task_finished;