diff --git a/tasks/ps_common/commonHelper.psm1 b/tasks/ps_common/commonHelper.psm1
index afbb100..45a287a 100644
--- a/tasks/ps_common/commonHelper.psm1
+++ b/tasks/ps_common/commonHelper.psm1
@@ -79,20 +79,8 @@ function Get-ProductIdAndFlightId
             $FlightId = Get-FlightIdFromFlightName -ProductId $productId -FlightName $FlightName -AccessToken $AccessToken
         }
 
-        if ([string]::IsNullOrEmpty($FlightId))
-        {
-            throw "Release track is set to Flight but FlightId cannot be found"
-        }
-
         Write-Verbose "Flight ID: $FlightId"
     }
-    elseif ($ReleaseTrack -eq "Production")
-    {
-        if ((-not [string]::IsNullOrEmpty($FlightId)) -or (-not [string]::IsNullOrEmpty($FlightName)))
-        {
-            throw "Release track is set to Production but FlightId and FlightName are provided. This is not alloed"
-        }
-    }
 
     return [PSCustomObject]@{ 'ProductId' = $productId;'FlightId' = $FlightId }
 }
diff --git a/tasks/store-publish-V3/publishUi.ps1 b/tasks/store-publish-V3/publishUi.ps1
index 2fe20be..c55cb74 100644
--- a/tasks/store-publish-V3/publishUi.ps1
+++ b/tasks/store-publish-V3/publishUi.ps1
@@ -305,7 +305,7 @@ try
                     # Catch any authorization related exception and retry polling by refreshing the access token
                     if ($_.Exception.Message -ilike "*Unauthorized*")
                     {
-                        Write-Output "Got exception while trying to check on submission and will try again. The exception was:" -Exception $_ -Level Warning
+                        Write-Output "Got exception with authentication while trying to check on submission. Will try again. The exception was:" -Exception $_ -Level Warning
                     }
                     else {
                         throw $_
diff --git a/tasks/store-publish-V3/task.json b/tasks/store-publish-V3/task.json
index fb7753d..3c81769 100644
--- a/tasks/store-publish-V3/task.json
+++ b/tasks/store-publish-V3/task.json
@@ -16,7 +16,7 @@
     "version": {
         "Major": "3",
         "Minor": "0",
-        "Patch": "26"
+        "Patch": "27"
     },
     "minimumAgentVersion": "2.117.0",
     "instanceNameFormat": "Publish $(appName)",
diff --git a/vss-extension.json b/vss-extension.json
index 6d530b9..d45ebed 100644
--- a/vss-extension.json
+++ b/vss-extension.json
@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
     "id": "windows-store-publish",
-    "version": "2.4.34",
+    "version": "2.4.36",
     "name": "Windows Store",
     "publisher": "ms-rdx-mro",
     "description": "Publish your applications on the Windows Store.",