diff --git a/src/if_lua.c b/src/if_lua.c
index 144fcbea5f..6ac3951122 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -1859,12 +1859,20 @@ luaV_setvar(lua_State *L)
 	    // Need to create an entry
 	    di = dictitem_alloc((char_u *)name);
 	    if (di == NULL)
+	    {
+		clear_tv(&tv);
 		return 0;
+	    }
 	    // Update the value
 	    copy_tv(&tv, &di->di_tv);
 	    if (dict_add(dict, di) == FAIL)
+	    {
+		dictitem_free(di);
+		clear_tv(&tv);
 		return luaL_error(L, "Couldn't add to dictionary");
-	} else
+	    }
+	}
+	else
 	{
 	    // Clear the old value
 	    clear_tv(&di->di_tv);
diff --git a/src/version.c b/src/version.c
index 2db7988ce2..c2d3998add 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3294,
 /**/
     3293,
 /**/