diff --git a/misc/options.c b/misc/options.c
index 9d5cec855ba3aed7ef0c7ec29ae4b27a15ecc218..8f596adbdbafe0aa648043a5f66bb270ce20fa38 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -330,6 +330,7 @@ void OPTIONS_ParseOptions( char *argv[] )
 
     if (GetEnvironmentVariableA( "WINEOPTIONS", buffer, sizeof(buffer) ) && buffer[0])
         inherit_options( buffer );
+    if (!argv) return;
 
     parse_options( argv + 1 );
 
diff --git a/scheduler/process.c b/scheduler/process.c
index 11e95e4b496b8b8e983c39b44e9c3b55ffffa7f3..1ea70b245a91cb0e27bc5637bd10cc9188ca0c83 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -316,7 +316,7 @@ static BOOL process_init( char *argv[] )
         return FALSE;
 
     /* Parse command line arguments */
-    if (!info) OPTIONS_ParseOptions( argv );
+    OPTIONS_ParseOptions( info ? argv : NULL );
     app_argc = 0;
     while (argv[app_argc]) app_argc++;