diff --git a/src/errors.h b/src/errors.h
index e719ffde1a..fc40fe865f 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3511,8 +3511,8 @@ EXTERN char e_member_str_type_mismatch_expected_str_but_got_str[]
 	INIT(= N_("E1406: Member \"%s\": type mismatch, expected %s but got %s"));
 EXTERN char e_method_str_type_mismatch_expected_str_but_got_str[]
 	INIT(= N_("E1407: Member \"%s\": type mismatch, expected %s but got %s"));
-EXTERN char e_aptypes_is_null_str_nr[]
-	INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %s: %d");
+EXTERN char e_aptypes_is_null_nr_str[]
+	INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %d: %s");
 EXTERN char e_interface_static_direct_access_str[]
 	INIT(= N_("E1409: Cannot directly access interface \"%s\" static member \"%s\""));
 // E1371 - E1399 unused
diff --git a/src/strings.c b/src/strings.c
index 710b1d35ce..33616d609b 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -2801,7 +2801,7 @@ skip_to_arg(
 
 	if (ap_types == NULL || ap_types[*arg_cur] == NULL)
 	{
-	    siemsg(e_aptypes_is_null_str_nr, fmt, *arg_cur);
+	    siemsg(e_aptypes_is_null_nr_str, *arg_cur, fmt);
 	    return;
 	}
 
diff --git a/src/version.c b/src/version.c
index da48158d3d..9797b234e7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1884,
 /**/
     1883,
 /**/