diff --git a/reactos/base/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c
index d41732d350d..d83dfe3016e 100644
--- a/reactos/base/system/services/rpcserver.c
+++ b/reactos/base/system/services/rpcserver.c
@@ -1225,7 +1225,7 @@ done:;
     else
     {
         /* Release the display name buffer */
-        if (lpService->lpServiceName != lpService->lpDisplayName)
+        if (lpService->lpServiceName != NULL)
             HeapFree(GetProcessHeap(), 0, lpService->lpDisplayName);
 
         if (hServiceHandle != NULL)
diff --git a/reactos/base/system/services/services.c b/reactos/base/system/services/services.c
index 5da67188faf..003ab4c4687 100644
--- a/reactos/base/system/services/services.c
+++ b/reactos/base/system/services/services.c
@@ -369,7 +369,8 @@ WinMain(HINSTANCE hInstance,
 
 #if 1
     hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-    WaitForSingleObject(hEvent, INFINITE);
+    if (hEvent)
+        WaitForSingleObject(hEvent, INFINITE);
 #else
     for (;;)
     {