diff --git a/src/evalvars.c b/src/evalvars.c
index 22d39a72f..eac66b2b9 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -319,7 +319,8 @@ garbage_collect_scriptvars(int copyID)
 	{
 	    svar_T    *sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;
 
-	    abort = abort || set_ref_in_item(sv->sv_tv, copyID, NULL, NULL);
+	    if (sv->sv_name != NULL)
+		abort = abort || set_ref_in_item(sv->sv_tv, copyID, NULL, NULL);
 	}
     }
 
diff --git a/src/version.c b/src/version.c
index 6c9617596..4a4d65a21 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 */
+/**/
+    2579,
 /**/
     2578,
 /**/