diff --git a/retroarch.c b/retroarch.c
index a2d90321d7..c66386dfe0 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -563,11 +563,7 @@ static void parse_input(int argc, char *argv[])
    };
 
    global->inited.core.no_content        = false;
-#ifdef HAVE_DYNAMIC
    global->inited.core.type              = CORE_TYPE_DUMMY;
-#else
-   global->inited.core.type              = CORE_TYPE_PLAIN;
-#endif
    *global->subsystem                    = '\0';
    global->has_set.save_path             = false;
    global->has_set.state_path            = false;
@@ -593,6 +589,9 @@ static void parse_input(int argc, char *argv[])
 
    global->overrides_active              = false;
 
+   if (argc < 2)
+      return;
+
    /* Make sure we can call parse_input several times ... */
    optind    = 0;
    optstring = "hs:fvS:A:c:U:DN:d:" BSV_MOVIE_ARG NETPLAY_ARG DYNAMIC_ARG FFMPEG_RECORD_ARG;