diff --git a/src/eval.c b/src/eval.c
index 7dfb981..1dae2bf 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7568,7 +7568,7 @@
 		return;
 	    }
 	    else if (v->di_tv.v_type != tv->v_type)
-		internal_error("set_var()");
+		EMSG2(_("E963: setting %s to value with wrong type"), name);
 	}
 
 	clear_tv(&v->di_tv);
diff --git a/src/version.c b/src/version.c
index f86f7c9..474c96b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    563,
+/**/
     562,
 /**/
     561,