diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index 838089e8628..362a4b1d5ee 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -717,7 +717,7 @@ int main(int argc, char** argv)
     /* parse options */
     while (argc > 0 && argv[0][0] == '-')
     {
-        if (!strcmp(argv[0], "--command"))
+        if (!strcmp(argv[0], "--command") && argc > 1)
         {
             argc--; argv++;
             hFile = parser_generate_command_file(argv[0], NULL);
@@ -729,7 +729,7 @@ int main(int argc, char** argv)
             argc--; argv++;
             continue;
         }
-        if (!strcmp(argv[0], "--file"))
+        if (!strcmp(argv[0], "--file") && argc > 1)
         {
             argc--; argv++;
             hFile = CreateFileA(argv[0], GENERIC_READ|DELETE, 0,