diff --git a/src/buffer.c b/src/buffer.c
index bc5dd5b47..328c2b37c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -888,8 +888,13 @@ init_changedtick(buf_T *buf)
 	di->di_tv.v_type = VAR_NUMBER;
 	di->di_tv.v_lock = VAR_FIXED;
 	di->di_tv.vval.v_number = 0;
-	dict_add(buf->b_vars, di);
-	buf->b_changedtick = &di->di_tv.vval.v_number;
+	if (dict_add(buf->b_vars, di) == OK)
+	    buf->b_changedtick = &di->di_tv.vval.v_number;
+	else
+	{
+	    vim_free(di);
+	    buf->b_changedtick = &buf->b_ct_val;
+	}
     }
     else
 #endif
diff --git a/src/version.c b/src/version.c
index 41a0321ed..ef71d0e39 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    340,
 /**/
     339,
 /**/