diff --git a/configuration.c b/configuration.c
index b470df838b..8e3544a253 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1748,12 +1748,12 @@ bool config_load_override(void)
  *
  * Returns: false if there was an error.
  */
- bool core_unload_override(void)
+ bool config_unload_override(void)
 {
    global_t *global = global_get_ptr();
    settings_t *settings = config_get_ptr();
 
-   *global->append_config_path = NULL;
+   *global->append_config_path = '\0';
    if (config_load_file(global->config_path, false))
    {
        RARCH_LOG("Configuration overrides unloaded, original configuration reset\n");
diff --git a/retroarch.c b/retroarch.c
index db79751d10..cb562399e7 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -24,6 +24,7 @@
 #include "libretro_version_1.h"
 #include "dynamic.h"
 #include "content.h"
+#include "configuration.h"
 #include <file/file_path.h>
 #include <file/dir_list.h>
 #include "general.h"
@@ -1857,7 +1858,7 @@ static void deinit_core(bool reinit)
    
    if(global->overrides_active)
    {       
-       core_unload_override();       
+       config_unload_override();
        pretro_set_environment(rarch_environment_cb);
    }
    
@@ -1906,8 +1907,7 @@ static bool init_core(void)
 
    pretro_set_environment(rarch_environment_cb);  
   
-   if (!config_load_remap())
-      RARCH_ERR("Error loading remap files\n");
+   config_load_remap();
 
    verify_api_version();
    pretro_init();