diff --git a/dll/win32/kernel32/client/console/alias.c b/dll/win32/kernel32/client/console/alias.c
index 4b27e2e5ac2..f400a7a0b8b 100644
--- a/dll/win32/kernel32/client/console/alias.c
+++ b/dll/win32/kernel32/client/console/alias.c
@@ -92,7 +92,7 @@ AddConsoleAliasW(LPCWSTR lpSource,
 
     CsrFreeCaptureBuffer(CaptureBuffer);
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -198,7 +198,7 @@ GetConsoleAliasW(LPWSTR lpSource,
                                  CaptureBuffer,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAlias),
                                  sizeof(CONSOLE_ADDGETALIAS));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         CsrFreeCaptureBuffer(CaptureBuffer);
         BaseSetLastNTError(Status);
@@ -335,7 +335,7 @@ GetConsoleAliasesW(LPWSTR AliasBuffer,
                                  CaptureBuffer,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliases),
                                  sizeof(CONSOLE_GETALLALIASES));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return 0;
@@ -432,7 +432,7 @@ GetConsoleAliasesLengthW(LPWSTR lpExeName)
 
     CsrFreeCaptureBuffer(CaptureBuffer);
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return 0;
@@ -502,7 +502,7 @@ GetConsoleAliasExesW(LPWSTR lpExeNameBuffer,
                                  CaptureBuffer,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasExes),
                                  sizeof(CONSOLE_GETALIASESEXES));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         CsrFreeCaptureBuffer(CaptureBuffer);
         BaseSetLastNTError(Status);
@@ -566,7 +566,7 @@ GetConsoleAliasExesLengthW(VOID)
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasExesLength),
                                  sizeof(CONSOLE_GETALIASESEXESLENGTH));
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return 0;
diff --git a/dll/win32/kernel32/client/console/console.c b/dll/win32/kernel32/client/console/console.c
index d27b8d5fa6b..02624ddd2e1 100644
--- a/dll/win32/kernel32/client/console/console.c
+++ b/dll/win32/kernel32/client/console/console.c
@@ -283,7 +283,7 @@ DuplicateConsoleHandle(HANDLE hConsole,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepDuplicateHandle),
                                  sizeof(CONSOLE_DUPLICATEHANDLE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return INVALID_HANDLE_VALUE;
@@ -363,7 +363,7 @@ GetConsoleHardwareState(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetHardwareState),
                                  sizeof(CONSOLE_GETSETHWSTATE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -472,7 +472,7 @@ OpenConsoleW(LPCWSTR wsName,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepOpenConsole),
                                  sizeof(CONSOLE_OPENCONSOLE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return INVALID_HANDLE_VALUE;
@@ -552,7 +552,7 @@ SetConsoleHardwareState(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetHardwareState),
                                  sizeof(CONSOLE_GETSETHWSTATE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -666,7 +666,7 @@ VerifyConsoleIoHandle(HANDLE Handle)
         return FALSE;
     }
 
-    return (BOOL)NT_SUCCESS(ApiMessage.Status);
+    return TRUE;
 }
 
 
@@ -866,7 +866,7 @@ AllocConsole(VOID)
 
     CsrFreeCaptureBuffer(CaptureBuffer);
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -905,7 +905,7 @@ FreeConsole(VOID)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFree),
                                  sizeof(CONSOLE_FREECONSOLE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -945,7 +945,7 @@ GetConsoleScreenBufferInfo(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetScreenBufferInfo),
                                  sizeof(CONSOLE_GETSCREENBUFFERINFO));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -977,7 +977,7 @@ SetConsoleCursorPosition(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursorPosition),
                                  sizeof(CONSOLE_SETCURSORPOSITION));
-    if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1007,7 +1007,7 @@ GetConsoleMode(HANDLE hConsoleHandle,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetMode),
                                  sizeof(CONSOLE_GETSETCONSOLEMODE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1040,7 +1040,7 @@ GetNumberOfConsoleInputEvents(HANDLE hConsoleInput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetNumberOfInputEvents),
                                  sizeof(CONSOLE_GETNUMINPUTEVENTS));
-    if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1103,7 +1103,7 @@ GetConsoleCursorInfo(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCursorInfo),
                                  sizeof(CONSOLE_GETSETCURSORINFO));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1151,7 +1151,7 @@ SetConsoleMode(HANDLE hConsoleHandle,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetMode),
                                  sizeof(CONSOLE_GETSETCONSOLEMODE));
-    if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1179,7 +1179,7 @@ SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetActiveScreenBuffer),
                                  sizeof(CONSOLE_SETACTIVESCREENBUFFER));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1207,7 +1207,7 @@ FlushConsoleInputBuffer(HANDLE hConsoleInput)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFlushInputBuffer),
                                  sizeof(CONSOLE_FLUSHINPUTBUFFER));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1237,7 +1237,7 @@ SetConsoleScreenBufferSize(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetScreenBufferSize),
                                  sizeof(CONSOLE_SETSCREENBUFFERSIZE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1267,7 +1267,7 @@ SetConsoleCursorInfo(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCursorInfo),
                                  sizeof(CONSOLE_GETSETCURSORINFO));
-    if(!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1312,7 +1312,7 @@ IntScrollConsoleScreenBuffer(HANDLE hConsoleOutput,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepScrollScreenBuffer),
                                  sizeof(CONSOLE_SCROLLSCREENBUFFER));
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1403,7 +1403,7 @@ SetConsoleTextAttribute(HANDLE hConsoleOutput,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetTextAttribute),
                                  sizeof(CONSOLE_SETTEXTATTRIB));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1535,7 +1535,7 @@ GenerateConsoleCtrlEvent(DWORD dwCtrlEvent,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGenerateCtrlEvent),
                                  sizeof(CONSOLE_GENERATECTRLEVENT));
-    if(!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = ApiMessage.Status)))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1572,7 +1572,7 @@ IntGetConsoleTitle(LPVOID lpConsoleTitle, DWORD nSize, BOOL bUnicode)
                                  CaptureBuffer,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetTitle),
                                  sizeof(CONSOLE_GETSETCONSOLETITLE));
-    if (!NT_SUCCESS(Status) || !(NT_SUCCESS(Status = ApiMessage.Status)))
+    if (!NT_SUCCESS(Status))
     {
         CsrFreeCaptureBuffer(CaptureBuffer);
         BaseSetLastNTError(Status);
@@ -1671,7 +1671,7 @@ SetConsoleTitleW(LPCWSTR lpConsoleTitle)
 
     CsrFreeCaptureBuffer(CaptureBuffer);
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1742,7 +1742,7 @@ CreateConsoleScreenBuffer(DWORD dwDesiredAccess,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepCreateScreenBuffer),
                                  sizeof(CONSOLE_CREATESCREENBUFFER));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return INVALID_HANDLE_VALUE;
@@ -1771,7 +1771,7 @@ GetConsoleCP(VOID)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return 0;
@@ -1801,7 +1801,7 @@ SetConsoleCP(UINT wCodePageID)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
     }
@@ -1829,7 +1829,7 @@ GetConsoleOutputCP(VOID)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError (Status);
         return 0;
@@ -1859,7 +1859,7 @@ SetConsoleOutputCP(UINT wCodePageID)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCP),
                                  sizeof(CONSOLE_GETSETINPUTOUTPUTCP));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
     }
@@ -1908,7 +1908,7 @@ GetConsoleProcessList(LPDWORD lpdwProcessList,
                                  CaptureBuffer,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetProcessList),
                                  sizeof(CONSOLE_GETPROCESSLIST));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError (Status);
         nProcesses = 0;
@@ -1949,7 +1949,7 @@ GetConsoleSelectionInfo(PCONSOLE_SELECTION_INFO lpConsoleSelectionInfo)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetSelectionInfo),
                                  sizeof(CONSOLE_GETSELECTIONINFO));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -1991,7 +1991,7 @@ AttachConsole(DWORD dwProcessId)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepAttach),
                                  sizeof(CONSOLE_ATTACHCONSOLE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -2027,10 +2027,10 @@ GetConsoleWindow(VOID)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetConsoleWindow),
                                  sizeof(CONSOLE_GETWINDOW));
-    if (!NT_SUCCESS(Status ) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
-        return (HWND) NULL;
+        return (HWND)NULL;
     }
 
     return ApiMessage.Data.GetWindowRequest.WindowHandle;
@@ -2055,7 +2055,7 @@ SetConsoleIcon(HICON hicon)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetIcon),
                                  sizeof(CONSOLE_SETICON));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
diff --git a/dll/win32/kernel32/client/console/history.c b/dll/win32/kernel32/client/console/history.c
index dbb8351c73b..5924e4a5871 100644
--- a/dll/win32/kernel32/client/console/history.c
+++ b/dll/win32/kernel32/client/console/history.c
@@ -82,7 +82,7 @@ IntExpungeConsoleCommandHistory(LPCVOID lpExeName, BOOL bUnicode)
 
     CsrFreeCaptureBuffer(CaptureBuffer);
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -126,7 +126,7 @@ IntGetConsoleCommandHistory(LPVOID lpHistory, DWORD cbHistory, LPCVOID lpExeName
                                  CaptureBuffer,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCommandHistory),
                                  sizeof(CONSOLE_GETCOMMANDHISTORY));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         CsrFreeCaptureBuffer(CaptureBuffer);
         BaseSetLastNTError(Status);
@@ -187,7 +187,7 @@ IntGetConsoleCommandHistoryLength(LPCVOID lpExeName, BOOL bUnicode)
 
     CsrFreeCaptureBuffer(CaptureBuffer);
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return 0;
@@ -232,7 +232,7 @@ IntSetConsoleNumberOfCommands(DWORD dwNumCommands,
 
     CsrFreeCaptureBuffer(CaptureBuffer);
 
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
diff --git a/dll/win32/kernel32/client/console/readwrite.c b/dll/win32/kernel32/client/console/readwrite.c
index ecb3b9ee893..df78b9510ab 100644
--- a/dll/win32/kernel32/client/console/readwrite.c
+++ b/dll/win32/kernel32/client/console/readwrite.c
@@ -79,7 +79,7 @@ IntReadConsole(HANDLE hConsoleInput,
                                  sizeof(CONSOLE_READCONSOLE));
 
     /* Check for success */
-    if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status))
+    if (NT_SUCCESS(Status))
     {
         memcpy(lpBuffer,
                ReadConsoleRequest->Buffer,
@@ -99,7 +99,7 @@ IntReadConsole(HANDLE hConsoleInput,
             *lpNumberOfCharsRead = 0;
 
         /* Error out */
-        BaseSetLastNTError(Status /* ApiMessage.Status */);
+        BaseSetLastNTError(Status);
     }
 
     CsrFreeCaptureBuffer(CaptureBuffer);
@@ -107,7 +107,7 @@ IntReadConsole(HANDLE hConsoleInput,
     /* Return TRUE or FALSE */
     // return TRUE;
     return (ReadConsoleRequest->NrCharactersRead > 0);
-    // return NT_SUCCESS(ApiMessage.Status);
+    // return NT_SUCCESS(Status);
 }
 
 
@@ -162,10 +162,10 @@ IntGetConsoleInput(HANDLE hConsoleInput,
                                  CaptureBuffer,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetConsoleInput),
                                  sizeof(CONSOLE_GETINPUT));
-    DPRINT("Server returned: %x\n", ApiMessage.Status);
+    DPRINT("Server returned: %x\n", Status);
 
     /* Check for success */
-    if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status))
+    if (NT_SUCCESS(Status))
     {
         /* Return the number of events read */
         DPRINT("Events read: %lx\n", GetInputRequest->InputsRead);
@@ -185,7 +185,7 @@ IntGetConsoleInput(HANDLE hConsoleInput,
             *lpNumberOfEventsRead = 0;
 
         /* Error out */
-        BaseSetLastNTError(ApiMessage.Status);
+        BaseSetLastNTError(Status);
     }
 
     /* Release the capture buffer */
@@ -193,7 +193,7 @@ IntGetConsoleInput(HANDLE hConsoleInput,
 
     /* Return TRUE or FALSE */
     return (GetInputRequest->InputsRead > 0);
-    // return NT_SUCCESS(ApiMessage.Status);
+    // return NT_SUCCESS(Status);
 }
 
 
@@ -346,7 +346,7 @@ IntReadConsoleOutputCode(HANDLE hConsoleOutput,
                                  sizeof(CONSOLE_READOUTPUTCODE));
 
     /* Check for success */
-    if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status))
+    if (NT_SUCCESS(Status))
     {
         CodesRead = ReadOutputCodeRequest->CodesRead;
         memcpy(pCode, ReadOutputCodeRequest->pCode.pCode, CodesRead * CodeSize);
@@ -364,7 +364,7 @@ IntReadConsoleOutputCode(HANDLE hConsoleOutput,
             *lpNumberOfCodesRead = 0;
 
         /* Error out */
-        BaseSetLastNTError(Status /* ApiMessage.Status */);
+        BaseSetLastNTError(Status);
         bRet = FALSE;
     }
 
@@ -425,7 +425,7 @@ IntWriteConsole(HANDLE hConsoleOutput,
                                  sizeof(CONSOLE_WRITECONSOLE));
 
     /* Check for success */
-    if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status))
+    if (NT_SUCCESS(Status))
     {
         if (lpNumberOfCharsWritten != NULL)
             *lpNumberOfCharsWritten = WriteConsoleRequest->NrCharactersWritten;
@@ -438,7 +438,7 @@ IntWriteConsole(HANDLE hConsoleOutput,
             *lpNumberOfCharsWritten = 0;
 
         /* Error out */
-        BaseSetLastNTError(Status /* ApiMessage.Status */);
+        BaseSetLastNTError(Status);
         bRet = FALSE;
     }
 
@@ -663,7 +663,7 @@ IntWriteConsoleOutputCode(HANDLE hConsoleOutput,
                                  sizeof(CONSOLE_WRITEOUTPUTCODE));
 
     /* Check for success */
-    if (NT_SUCCESS(Status) || NT_SUCCESS(Status = ApiMessage.Status))
+    if (NT_SUCCESS(Status))
     {
         // WriteOutputCodeRequest->Coord = WriteOutputCodeRequest->EndCoord;
 
@@ -679,7 +679,7 @@ IntWriteConsoleOutputCode(HANDLE hConsoleOutput,
             *lpNumberOfCodesWritten = 0;
 
         /* Error out */
-        BaseSetLastNTError(Status /* ApiMessage.Status */);
+        BaseSetLastNTError(Status);
         bRet = FALSE;
     }
 
@@ -735,7 +735,7 @@ IntFillConsoleOutputCode(HANDLE hConsoleOutput,
                                  sizeof(CONSOLE_FILLOUTPUTCODE));
 
     /* Check for success */
-    if (NT_SUCCESS(ApiMessage.Status))
+    if (NT_SUCCESS(Status))
     {
         if (lpNumberOfCodesWritten != NULL)
             *lpNumberOfCodesWritten = FillOutputRequest->Length;
diff --git a/dll/win32/kernel32/client/console/vista.c b/dll/win32/kernel32/client/console/vista.c
index ccf875028b4..ec034122692 100644
--- a/dll/win32/kernel32/client/console/vista.c
+++ b/dll/win32/kernel32/client/console/vista.c
@@ -41,7 +41,7 @@ GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetHistory),
                                  sizeof(CONSOLE_GETSETHISTORYINFO));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
@@ -82,7 +82,7 @@ SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetHistory),
                                  sizeof(CONSOLE_GETSETHISTORYINFO));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         BaseSetLastNTError(Status);
         return FALSE;
diff --git a/dll/win32/kernel32/client/dosdev.c b/dll/win32/kernel32/client/dosdev.c
index 8843ed20a84..19be52f02cb 100644
--- a/dll/win32/kernel32/client/dosdev.c
+++ b/dll/win32/kernel32/client/dosdev.c
@@ -188,10 +188,9 @@ DefineDosDeviceW(
                                      sizeof(BASE_DEFINE_DOS_DEVICE));
         CsrFreeCaptureBuffer(CaptureBuffer);
 
-        if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+        if (!NT_SUCCESS(Status))
         {
-            WARN("CsrClientCallServer() failed (Status %lx)\n",
-                Status);
+            WARN("CsrClientCallServer() failed (Status %lx)\n", Status);
             BaseSetLastNTError(Status);
             Result = FALSE;
         }
diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c
index 7fd9ce630a9..50f7c398c7a 100644
--- a/dll/win32/kernel32/client/proc.c
+++ b/dll/win32/kernel32/client/proc.c
@@ -509,10 +509,10 @@ BasepNotifyCsrOfThread(IN HANDLE ThreadHandle,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCreateThread),
                                  sizeof(BASE_CREATE_THREAD));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Failed to tell CSRSS about new thread: %lx %lx\n", Status, ApiMessage.Status);
-        return ApiMessage.Status;
+        DPRINT1("Failed to tell CSRSS about new thread: %lx\n", Status);
+        return Status;
     }
 
     /* Return Success */
@@ -594,9 +594,9 @@ BasepCreateFirstThread(HANDLE ProcessHandle,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCreateProcess),
                                  sizeof(BASE_CREATE_PROCESS));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
-        DPRINT1("Failed to tell CSRSS about new process: %lx %lx\n", Status, ApiMessage.Status);
+        DPRINT1("Failed to tell CSRSS about new process: %lx\n", Status);
         return NULL;
     }
 
@@ -1193,10 +1193,10 @@ GetProcessShutdownParameters(OUT LPDWORD lpdwLevel,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetProcessShutdownParam),
                                  sizeof(BASE_GET_PROCESS_SHUTDOWN_PARAMS));
-    if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(ApiMessage.Status)))
+    if (!NT_SUCCESS(Status))
     {
         /* Return the failure from CSRSS */
-        BaseSetLastNTError(ApiMessage.Status);
+        BaseSetLastNTError(Status);
         return FALSE;
     }
 
@@ -1225,10 +1225,10 @@ SetProcessShutdownParameters(IN DWORD dwLevel,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetProcessShutdownParam),
                                  sizeof(BASE_SET_PROCESS_SHUTDOWN_PARAMS));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         /* Return the failure from CSRSS */
-        BaseSetLastNTError(ApiMessage.Status);
+        BaseSetLastNTError(Status);
         return FALSE;
     }
 
diff --git a/dll/win32/kernel32/client/vdm.c b/dll/win32/kernel32/client/vdm.c
index 051c9e4c1c0..ea83cc6a5cb 100644
--- a/dll/win32/kernel32/client/vdm.c
+++ b/dll/win32/kernel32/client/vdm.c
@@ -138,10 +138,10 @@ BaseUpdateVDMEntry(IN ULONG UpdateIndex,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepUpdateVDMEntry),
                                  sizeof(BASE_UPDATE_VDM_ENTRY));
-    if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(ApiMessage.Status)))
+    if (!NT_SUCCESS(Status))
     {
         /* Handle failure */
-        BaseSetLastNTError(ApiMessage.Status);
+        BaseSetLastNTError(Status);
         return FALSE;
     }
 
diff --git a/win32ss/user/user32/misc/exit.c b/win32ss/user/user32/misc/exit.c
index ddcce382901..a76d2789753 100644
--- a/win32ss/user/user32/misc/exit.c
+++ b/win32ss/user/user32/misc/exit.c
@@ -77,7 +77,7 @@ ExitWindowsEx(UINT uFlags,
                                  NULL,
                                  CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpExitWindowsEx),
                                  sizeof(CSRSS_EXIT_REACTOS));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         SetLastError(RtlNtStatusToDosError(Status));
         return FALSE;
@@ -102,7 +102,7 @@ RegisterServicesProcess(DWORD ServicesProcessId)
                                  NULL,
                                  CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterServicesProcess),
                                  sizeof(CSRSS_REGISTER_SERVICES_PROCESS));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+    if (!NT_SUCCESS(Status))
     {
         SetLastError(RtlNtStatusToDosError(Status));
         return FALSE;
diff --git a/win32ss/user/user32/misc/misc.c b/win32ss/user/user32/misc/misc.c
index 7a51f4dcfb6..af571a0cfa0 100644
--- a/win32ss/user/user32/misc/misc.c
+++ b/win32ss/user/user32/misc/misc.c
@@ -56,10 +56,10 @@ RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
                                      NULL,
                                      CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess),
                                      sizeof(CSRSS_REGISTER_LOGON_PROCESS));
-        if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = ApiMessage.Status))
+        if (!NT_SUCCESS(Status))
         {
-            SetLastError(RtlNtStatusToDosError(Status));
             ERR("Failed to register logon process with CSRSS\n");
+            SetLastError(RtlNtStatusToDosError(Status));
             // return FALSE;
         }
     }