diff --git a/src/testing.c b/src/testing.c
index 0971876..ed2d511 100644
--- a/src/testing.c
+++ b/src/testing.c
@@ -615,7 +615,8 @@
 	    goto theend;
 	}
 
-	if (!error_found && argvars[3].v_type == VAR_NUMBER
+	if (!error_found && argvars[2].v_type != VAR_UNKNOWN
+		&& argvars[3].v_type == VAR_NUMBER
 		&& argvars[3].vval.v_number >= 0
 		&& argvars[3].vval.v_number != emsg_assert_fails_lnum)
 	{
diff --git a/src/version.c b/src/version.c
index 028b910..80f464a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1484,
+/**/
     1483,
 /**/
     1482,