diff --git a/reactos/dll/win32/rpcrt4/ndr_marshall.c b/reactos/dll/win32/rpcrt4/ndr_marshall.c
index c7af9e6677a..f7b394f0813 100644
--- a/reactos/dll/win32/rpcrt4/ndr_marshall.c
+++ b/reactos/dll/win32/rpcrt4/ndr_marshall.c
@@ -3246,7 +3246,14 @@ void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,
                                      NDR_CCONTEXT ContextHandle,
                                      int fCheck)
 {
-    FIXME("(%p, %p, %d): stub\n", pStubMsg, ContextHandle, fCheck);
+   
+	if(!ContextHandle) 
+		RpcRaiseException(ERROR_INVALID_HANDLE);
+
+	NDRCContextMarshall(ContextHandle, pStubMsg->Buffer);
+	
+	pStubMsg->Buffer += 20;
+
 }
 
 /***********************************************************************