diff --git a/src/eval.c b/src/eval.c
index 0dd2058..1fd4765 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -906,6 +906,7 @@
     {
 	// using local variable
 	lp->ll_tv = lval_root;
+	v = NULL;
     }
     else
     {
@@ -967,6 +968,7 @@
 	}
 
 	if (in_vim9script() && lp->ll_valtype == NULL
+		&& v != NULL
 		&& lp->ll_tv == &v->di_tv
 		&& ht != NULL && ht == get_script_local_ht())
 	{
diff --git a/src/version.c b/src/version.c
index 4c1be4e..87c315a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3340,
+/**/
     3339,
 /**/
     3338,