diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 1dbd01494e..82e9c577af 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1544,6 +1544,9 @@ make_filter_cmd(
     int		is_fish_shell;
     char_u	*shell_name = get_isolated_shell_name();
 
+    if (shell_name == NULL)
+	return NULL;
+
     // Account for fish's different syntax for subshells
     is_fish_shell = (fnamecmp(shell_name, "fish") == 0);
     vim_free(shell_name);
diff --git a/src/version.c b/src/version.c
index ba9c8162b7..b4c6582556 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1899,
 /**/
     1898,
 /**/