diff --git a/src/modules/launcher/Directory.Build.targets b/src/modules/launcher/Directory.Build.targets
index 04f8d7e76e..cba92d64e1 100644
--- a/src/modules/launcher/Directory.Build.targets
+++ b/src/modules/launcher/Directory.Build.targets
@@ -2,7 +2,13 @@
   
    <Target Name="KillPowerLauncher" BeforeTargets="PreBuildEvent;BeforeClean">
     <Message Text="Killing process 'PowerLauncher.exe'" Importance="normal" ContinueOnError="true" />
-    <Exec Command="taskkill /f /im PowerLauncher.exe" ContinueOnError="true"/>
+     <Exec Command="taskkill /F /IM PowerLauncher.exe"
+              IgnoreExitCode="true"
+              IgnoreStandardErrorWarningFormat="true">
+       <Output TaskParameter="ExitCode" PropertyName="ErrorCode"/>
+     </Exec>
+     <Error Text="Cannot kill PowerLauncher.exe process." Condition="$(ErrorCode) == 1"/>
+     <Message Text="Process PowerLauncher.exe does not exist." Condition="$(ErrorCode) == 128"/>
   </Target>
 
 </Project>
\ No newline at end of file