diff --git a/src/dosinst.c b/src/dosinst.c
index 608f381..e77152f 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -2495,7 +2495,7 @@
 	    int vimfiles_dir_choice = (int)vimfiles_dir_none;
 
 	    init_directories_choice();
-	    if (argv[i + 1][0] != '-')
+	    if (i + 1 < argc && argv[i + 1][0] != '-')
 	    {
 		i++;
 		if (strcmp(argv[i], "vim") == 0)
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9614f55..56288d7 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -863,6 +863,7 @@
   bwipe!
 
   filetype off
+  call delete('Xfile.d')
 endfunc
 
 func Test_dep3patch_file()
diff --git a/src/version.c b/src/version.c
index 94479e3..d82fff5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,10 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4467,
+/**/
+    4466,
+/**/
     4465,
 /**/
     4464,