diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 693179fa05a..5cb470e0c71 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -987,7 +987,7 @@ static BOOL build_command_line( WCHAR **argv )
         has_space=FALSE;
         bcount=0;
         a=*arg;
-        if( !*a ) has_space=TRUE;
+        if( arg == argv || !*a ) has_space=TRUE;
         while (*a!='\0') {
             if (*a=='\\') {
                 bcount++;
@@ -1024,7 +1024,7 @@ static BOOL build_command_line( WCHAR **argv )
         /* Check for quotes and spaces in this argument */
         has_space=has_quote=FALSE;
         a=*arg;
-        if( !*a ) has_space=TRUE;
+        if( arg == argv || !*a ) has_space=TRUE;
         while (*a!='\0') {
             if (*a==' ' || *a=='\t') {
                 has_space=TRUE;