diff --git a/src/version.c b/src/version.c
index 9c162fbbbd..a39bdba2ec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1037,
 /**/
     1036,
 /**/
diff --git a/src/vim9class.c b/src/vim9class.c
index 864a2e00b9..c2a17e1279 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -121,8 +121,8 @@ ex_class(exarg_T *eap)
 		semsg(_(e_command_cannot_be_shortened_str), line);
 	    else if (*p == '|' || !ends_excmd2(line, p))
 		semsg(_(e_trailing_characters_str), p);
-
-	    success = TRUE;
+	    else
+		success = TRUE;
 	    break;
 	}
 
@@ -190,9 +190,10 @@ ex_class(exarg_T *eap)
 
 	// Members are used by the new() function, add them here.
 	cl->class_obj_member_count = objmembers.ga_len;
-	cl->class_obj_members = ALLOC_MULT(objmember_T, objmembers.ga_len);
+	cl->class_obj_members = objmembers.ga_len == 0 ? NULL
+				  : ALLOC_MULT(objmember_T, objmembers.ga_len);
 	if (cl->class_name == NULL
-		|| cl->class_obj_members == NULL)
+		|| (objmembers.ga_len > 0 && cl->class_obj_members == NULL))
 	{
 	    vim_free(cl->class_name);
 	    vim_free(cl->class_obj_members);