diff --git a/src/eval.c b/src/eval.c
index f7445bf40f..61b09fb6b0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6159,7 +6159,7 @@ handle_subscript(
 	    char_u	*exp_name;
 	    int		cc;
 	    int		idx;
-	    ufunc_T	*ufunc = NULL;
+	    ufunc_T	*ufunc;
 	    type_T	*type;
 
 	    // Found script from "import {name} as name", script item name must
diff --git a/src/version.c b/src/version.c
index 36adeb6d6d..612d9e0600 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4822,
 /**/
     4821,
 /**/
diff --git a/src/vim9script.c b/src/vim9script.c
index bb5f0299dc..b1bfe634cb 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -710,6 +710,8 @@ find_exported(
     svar_T	*sv;
     scriptitem_T *script = SCRIPT_ITEM(sid);
 
+    *ufunc = NULL;
+
     if (script->sn_import_autoload && script->sn_state == SN_STATE_NOT_LOADED)
     {
 	if (do_source(script->sn_name, FALSE, DOSO_NONE, NULL) == FAIL)
@@ -724,7 +726,6 @@ find_exported(
     if (idx >= 0)
     {
 	sv = ((svar_T *)script->sn_var_vals.ga_data) + idx;
-	*ufunc = NULL;
 	if ((sv->sv_flags & SVFLAG_EXPORTED) == 0)
 	{
 	    if (verbose)