diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 1a3253ec9e2818..a20fcb39214419 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -165,8 +165,8 @@ fetchTool()
     xmlFileAsString=`cat "$vcpkgRootDir/scripts/vcpkgTools.xml"`
     toolRegexStart="<tool name=\"$tool\" os=\"$os\">"
     toolData="$(extractStringBetweenDelimiters "$xmlFileAsString" "$toolRegexStart" "</tool>")"
-    if [ "$toolData" = "" ]; then
-        echo "Unknown tool: $tool"
+    if [ "$toolData" = "" ] || [[ "$toolData" == "<?xml"* ]]; then
+        echo "No entry for $toolRegexStart in $vcpkgRootDir/scripts/vcpkgTools.xml"
         return 1
     fi