diff --git a/server/trace.c b/server/trace.c
index fcd24e62d48..70284ce8852 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -3945,10 +3945,12 @@ static const struct
 {
     { "ACCESS_DENIED",               STATUS_ACCESS_DENIED },
     { "ACCESS_VIOLATION",            STATUS_ACCESS_VIOLATION },
+    { "ALERTED",                     STATUS_ALERTED },
     { "ALIAS_EXISTS",                STATUS_ALIAS_EXISTS },
     { "BAD_DEVICE_TYPE",             STATUS_BAD_DEVICE_TYPE },
     { "BUFFER_OVERFLOW",             STATUS_BUFFER_OVERFLOW },
     { "BUFFER_TOO_SMALL",            STATUS_BUFFER_TOO_SMALL },
+    { "CANCELLED",                   STATUS_CANCELLED },
     { "CHILD_MUST_BE_VOLATILE",      STATUS_CHILD_MUST_BE_VOLATILE },
     { "DEVICE_BUSY",                 STATUS_DEVICE_BUSY },
     { "DIRECTORY_NOT_EMPTY",         STATUS_DIRECTORY_NOT_EMPTY },
@@ -3963,6 +3965,7 @@ static const struct
     { "ERROR_SEEK",                  0xc0010000 | ERROR_SEEK },
     { "FILE_IS_A_DIRECTORY",         STATUS_FILE_IS_A_DIRECTORY },
     { "FILE_LOCK_CONFLICT",          STATUS_FILE_LOCK_CONFLICT },
+    { "HANDLES_CLOSED",              STATUS_HANDLES_CLOSED },
     { "HANDLE_NOT_CLOSABLE",         STATUS_HANDLE_NOT_CLOSABLE },
     { "INSTANCE_NOT_AVAILABLE",      STATUS_INSTANCE_NOT_AVAILABLE },
     { "INVALID_CID",                 STATUS_INVALID_CID },
diff --git a/tools/make_requests b/tools/make_requests
index 58f6947c2b7..7e922be266a 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -241,7 +241,11 @@ sub GET_ERROR_NAMES()
         {
             if (/set_error\s*\(\s*STATUS_(\w+)\s*\)/)
             {
-                $errors{$1} = "STATUS_$1";
+                $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS";
+            }
+            elsif (/async_terminate_\w+\s*\(.*,\s*STATUS_(\w+)\s*\)/)
+            {
+                $errors{$1} = "STATUS_$1" unless $1 eq "SUCCESS";
             }
             elsif (/set_win32_error\s*\(\s*(\w+)\s*\)/)
             {