diff --git a/nupkg/push_packages.ps1 b/nupkg/push_packages.ps1
index eb03df621b..dc2e729293 100644
--- a/nupkg/push_packages.ps1
+++ b/nupkg/push_packages.ps1
@@ -7,10 +7,29 @@ $apiKey = $args[0]
 $version = $commonPropsXml.Project.PropertyGroup.Version
 
 # Publish all packages
+$i = 0
+$nugetUrl = "https://api.nuget.org/v3/index.json"
+Set-Location $packFolder
+
 foreach($project in $projects) {
-    $projectName = $project.Substring($project.LastIndexOf("/") + 1)
-    & dotnet nuget push ($projectName + "." + $version + ".nupkg") --skip-duplicate -s https://api.nuget.org/v3/index.json --api-key "$apiKey"
+	$i += 1
+	$projectFolder = Join-Path $rootFolder $project
+	$projectName = ($project -split '/')[-1]
+	$nugetPackageName = $projectName + "." + $version + ".nupkg"	
+	$nugetPackageExists = Test-Path $nugetPackageName -PathType leaf
+ 
+	Write-Host ("-----===[ $i / " + $projects.length  + " - " + $nugetPackageName + " ]===-----")
+	
+	if ($nugetPackageExists)
+	{
+		dotnet nuget push $nugetPackageName --skip-duplicate -s $nugetUrl --api-key "$apiKey"		
+		Write-Host ("Deleting package from local: " + $nugetPackageName)
+		Remove-Item $nugetPackageName -Force
+	}
+	else
+	{
+		Write-Host ("********** ERROR PACKAGE NOT FOUND: " + $nugetPackageName)
+		#Exit
+	}
 }
 
-# Go back to the pack folder
-Set-Location $packFolder