diff --git a/tools/before-test.cmd b/tools/before-test.cmd
index 0449209..16ec3dd 100644
--- a/tools/before-test.cmd
+++ b/tools/before-test.cmd
@@ -57,16 +57,16 @@ IF NOT DEFINED PLATFORM (
 )
 
 :: hack to determine latest tag in epanet-example-networks repo
-:: TODO: use GitHub api instead
 set "LATEST_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/latest"
 FOR /F delims^=^"^ tokens^=2 %%g IN ('curl --silent %LATEST_URL%') DO ( set "LATEST_TAG=%%~nxg" )
 
-set "TESTFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/%LATEST_TAG%.zip"
-set "BENCHFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/%LATEST_TAG%/benchmark-%PLATFORM%-%REF_BUILD_ID%.zip"
-
+IF defined LATEST_TAG (
+  set "TESTFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/%LATEST_TAG%.zip"
+  set "BENCHFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/%LATEST_TAG%/benchmark-%PLATFORM%-%REF_BUILD_ID%.zip"
+) ELSE ( echo ERROR: Unable to determine latest tag & EXIT /B 1 )
 
 :: create a clean directory for staging regression tests
-if exist %TEST_HOME% (
+IF exist %TEST_HOME% (
   rmdir /s /q %TEST_HOME%
 )
 mkdir %TEST_HOME%