diff --git a/src/eval.c b/src/eval.c
index 1dae2bf..8839e05 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7568,7 +7568,10 @@
 		return;
 	    }
 	    else if (v->di_tv.v_type != tv->v_type)
+	    {
 		EMSG2(_("E963: setting %s to value with wrong type"), name);
+		return;
+	    }
 	}
 
 	clear_tv(&v->di_tv);
diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index bcf45cc..a1aa788 100644
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -53,3 +53,13 @@
 	"\ and some more
   call assert_equal([5, 6], array)
 endfunc
+
+func Test_E963()
+  " These commands used to cause an internal error prior to vim 8.1.0563
+  let v_e = v:errors
+  let v_o = v:oldfiles
+  call assert_fails("let v:errors=''", 'E963:')
+  call assert_equal(v_e, v:errors)
+  call assert_fails("let v:oldfiles=''", 'E963:')
+  call assert_equal(v_o, v:oldfiles)
+endfunc
diff --git a/src/version.c b/src/version.c
index 474c96b..bc44242 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    564,
+/**/
     563,
 /**/
     562,