diff --git a/command_event.c b/command_event.c
index 667faf892d..10fadbdf2c 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1266,7 +1266,9 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
          }
       case EVENT_CMD_CORE_INIT:
          if (!event_init_core())
+         {
             return false;
+         }
          break;
       case EVENT_CMD_VIDEO_APPLY_STATE_CHANGES:
          video_driver_ctl(RARCH_DISPLAY_CTL_APPLY_STATE_CHANGES, NULL);
diff --git a/content.c b/content.c
index 59a79961a6..abd04da34a 100644
--- a/content.c
+++ b/content.c
@@ -541,7 +541,7 @@ static bool load_content(
    if (!ret)
       RARCH_ERR("%s.\n", msg_hash_to_str(MSG_FAILED_TO_LOAD_CONTENT));
 
-   return true;
+   return ret;
 }
 
 static bool init_content_file_subsystem(
@@ -827,7 +827,8 @@ bool content_ctl(enum content_ctl_state state, void *data)
             content_is_inited = true;
             return true;
          }
-         /* fall-through */
+         content_ctl(CONTENT_CTL_DEINIT, NULL);
+         return false;
       case CONTENT_CTL_TEMPORARY_FREE:
          if (!temporary_content)
             return false;