diff --git a/command_event.c b/command_event.c
index 6de574c3bb..b909b80d5d 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1115,7 +1115,7 @@ bool event_command(enum event_command cmd)
       case EVENT_CMD_RESET:
          RARCH_LOG("%s.\n", msg_hash_to_str(MSG_RESET));
          rarch_main_msg_queue_push_new(MSG_RESET, 1, 120, true);
-         
+
 #ifdef HAVE_CHEEVOS
          cheevos_globals.cheats_were_enabled = cheevos_globals.cheats_are_enabled;
 #endif
diff --git a/input/input_remapping.c b/input/input_remapping.c
index 293ddfd65f..96c84d48f3 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -33,7 +33,7 @@ bool input_remapping_load_file(const char *path)
    config_file_t *conf  = config_file_new(path);
    settings_t *settings = config_get_ptr();
 
-   if (!conf)
+   if (!conf ||  path[0] == '\0')
       return false;
 
    strlcpy(settings->input.remapping_path, path,