diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 12824a9..a9adea3 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7411,9 +7411,9 @@
 # endif
 	new_dir = NameBuff;
     }
-    dir_differs = new_dir == NULL || pdir == NULL
+    dir_differs = pdir == NULL
 	|| pathcmp((char *)pdir, (char *)new_dir, -1) != 0;
-    if (new_dir == NULL || (dir_differs && vim_chdir(new_dir)))
+    if (dir_differs && vim_chdir(new_dir))
     {
 	emsg(_(e_failed));
 	vim_free(pdir);
diff --git a/src/version.c b/src/version.c
index 25e40bf..56825f5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3947,
+/**/
     3946,
 /**/
     3945,