diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index e89ff731b3..9589b91eba 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -147,7 +147,7 @@ static char** waiting_argv;
    
    self.settingsWindow = [[[NSWindowController alloc] initWithWindowNibName:BOXSTRING("Settings")] autorelease];
    
-   core_info_set_core_path(g_defaults.core_dir);
+   core_info_set_core_path();
    core_info_set_config_path(g_defaults.menu_config_dir);
    core_list = (const core_info_list_t*)core_info_list_get();
 
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index 5b1b328976..14ce68ba46 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -225,7 +225,7 @@ static void handle_touch_event(NSArray* touches)
     }
    
    // Warn if there are no cores present
-   core_info_set_core_path(g_defaults.core_dir);
+   core_info_set_core_path();
    core_info_set_config_path(g_defaults.menu_config_dir);
    core_list = (const core_info_list_t*)core_info_list_get();
    
diff --git a/frontend/info/core_info.c b/frontend/info/core_info.c
index 050f664bc1..d4e3eecefa 100644
--- a/frontend/info/core_info.c
+++ b/frontend/info/core_info.c
@@ -434,15 +434,9 @@ void core_info_list_get_missing_firmware(core_info_list_t *core_info_list,
    qsort(info->firmware, info->firmware_count, sizeof(*info->firmware), core_info_firmware_cmp);
 }
 
-void core_info_set_core_path(const char *core_path)
+void core_info_set_core_path(void)
 {
-   if (global_core_list)
-      core_info_list_free(global_core_list);
-   
-   global_core_list = core_path ? core_info_list_new(core_path) : 0;
-
-   if (!global_core_list)
-      RARCH_WARN("No cores were found at %s", core_path ? core_path : "(null");
+   global_core_list = core_info_list_new(g_defaults.core_dir);
 }
 
 void core_info_set_config_path(const char *config_path)
@@ -453,9 +447,6 @@ void core_info_set_config_path(const char *config_path)
 
 core_info_list_t *core_info_list_get(void)
 {
-   if (!global_core_list)
-      RARCH_WARN("core_info_list_get() called before core_info_set_core_path()");
-
    return global_core_list;
 }
 
diff --git a/frontend/info/core_info.h b/frontend/info/core_info.h
index 93aeaf7e30..67d033b471 100644
--- a/frontend/info/core_info.h
+++ b/frontend/info/core_info.h
@@ -86,7 +86,7 @@ const char *core_info_list_get_all_extensions(core_info_list_t *list);
 
 bool core_info_list_get_display_name(core_info_list_t *list, const char *path, char *buf, size_t size);
 
-void core_info_set_core_path(const char *core_path);
+void core_info_set_core_path(void);
 void core_info_set_config_path(const char *config_path);
 
 core_info_list_t *core_info_list_get(void);