diff --git a/src/CommonLib/resources.h b/src/CommonLib/resources.h
index 776865fe15..31b981d0fa 100644
--- a/src/CommonLib/resources.h
+++ b/src/CommonLib/resources.h
@@ -12,7 +12,7 @@
 #define ASPNETCORE_EVENT_MSG_BUFFER_SIZE 256
 #define ASPNETCORE_EVENT_PROCESS_START_SUCCESS_MSG           L"Application '%s' started process '%d' successfully and is listening on port '%d'."
 #define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED_MSG       L"Maximum rapid fail count per minute of '%d' exceeded."
-#define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG             L"Application '%s' with physical root '%s' failed to start process with commandline '%s' at stage '%s', ErrorCode = '0x%x', retryCounter '%d'."
+#define ASPNETCORE_EVENT_PROCESS_START_ERROR_MSG             L"Application '%s' with physical root '%s' failed to start process with commandline '%s' at stage '%s', ErrorCode = '0x%x', assigned port %d, retryCounter '%d'."
 #define ASPNETCORE_EVENT_PROCESS_START_FAILURE_MSG           L"Application '%s' with physical root '%s' failed to start process with commandline '%s' with multiple retries. The last try of listening port is '%d'. See pervious warnings for details."
 #define ASPNETCORE_EVENT_PROCESS_START_STATUS_ERROR_MSG      L"Application '%s' with physical root '%s' failed to start process with commandline '%s' , ErrorCode = '0x%x', processStatus '%d'."
 #define ASPNETCORE_EVENT_PROCESS_START_PORTSETUP_ERROR_MSG   L"Application '%s' with physical root '%s' failed to choose listen port '%d' given port rang '%d - %d', EorrorCode = '0x%x'. If environment variable 'ASPNETCORE_PORT' was set, try removing it such that a random port is selected instead."
diff --git a/src/RequestHandler/outofprocess/serverprocess.cxx b/src/RequestHandler/outofprocess/serverprocess.cxx
index e6fc873202..03f957c17d 100644
--- a/src/RequestHandler/outofprocess/serverprocess.cxx
+++ b/src/RequestHandler/outofprocess/serverprocess.cxx
@@ -510,7 +510,7 @@ SERVER_PROCESS::PostStartCheck(
     dwTickCount = GetTickCount();
     do
     {
-        DWORD processStatus;
+        DWORD processStatus = 0;
         if (GetExitCodeProcess(m_hProcessHandle, &processStatus))
         {
             // make sure the process is still running
@@ -747,6 +747,7 @@ SERVER_PROCESS::StartProcess(
 
     while (dwRetryCount > 0)
     {
+        m_dwPort = 0;
         dwRetryCount--;
         //
         // generate process command line.
@@ -893,6 +894,7 @@ SERVER_PROCESS::StartProcess(
                 m_struCommandLine.QueryStr(),
                 pStrStage,
                 hr,
+                m_dwPort,
                 dwRetryCount)))
         {
             UTILITY::LogEvent(g_hEventLog,