diff --git a/reactos/subsystems/csr/csrsrv/api.c b/reactos/subsystems/csr/csrsrv/api.c
index 38fd18fa955..db495091520 100644
--- a/reactos/subsystems/csr/csrsrv/api.c
+++ b/reactos/subsystems/csr/csrsrv/api.c
@@ -1227,7 +1227,7 @@ CsrCallServerFromServer(PCSR_API_MESSAGE ReceiveMsg,
     _SEH2_TRY
     {
         /* Call the API and get the result */
-        Status = (ServerDll->DispatchTable[ApiId])(ReceiveMsg, &Reply);
+        Status = ServerDll->DispatchTable[ApiId](ReceiveMsg, &Reply);
 
         /* Return the result, no matter what it is */
         ReplyMsg->Status = Status;
diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/process.c b/reactos/subsystems/win32/csrss/csrsrv/api/process.c
index f8bdd0f54c4..7576a4b0a45 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/process.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/process.c
@@ -173,6 +173,7 @@ CSR_API(CsrSrvCreateThread)
     PCSR_PROCESS CsrProcess;
     
     CurrentThread = NtCurrentTeb()->CsrClientThread;
+    if (!CurrentThread) return STATUS_SUCCESS; // server-to-server
     CsrProcess = CurrentThread->Process;
 
     if (CsrProcess->ClientId.UniqueProcess != Request->Data.CreateThreadRequest.ClientId.UniqueProcess)