diff --git a/bin/cassandra-cli.bat b/bin/cassandra-cli.bat
index a4d01023e0..0d52bdf48c 100644
--- a/bin/cassandra-cli.bat
+++ b/bin/cassandra-cli.bat
@@ -19,7 +19,7 @@
 if "%OS%" == "Windows_NT" setlocal
 
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
-if NOT DEFINED JAVA_HOME goto err
+if NOT DEFINED JAVA_HOME goto :err
 
 REM Ensure that any user defined CLASSPATH variables are not used on startup
 set CLASSPATH=
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 58e9611a78..283abe9454 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -26,7 +26,7 @@ if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
 popd
 
 if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.thrift.CassandraDaemon
-if NOT DEFINED JAVA_HOME goto err
+if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=-ea^
diff --git a/bin/json2sstable.bat b/bin/json2sstable.bat
index b42c34edb5..dc1e8f664d 100644
--- a/bin/json2sstable.bat
+++ b/bin/json2sstable.bat
@@ -20,7 +20,7 @@ if "%OS%" == "Windows_NT" setlocal
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF="%CASSANDRA_HOME%\conf"
 if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableImport
-if NOT DEFINED JAVA_HOME goto err
+if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
diff --git a/bin/nodetool.bat b/bin/nodetool.bat
index 200fb4a9d4..2f74687e00 100644
--- a/bin/nodetool.bat
+++ b/bin/nodetool.bat
@@ -18,7 +18,7 @@
 if "%OS%" == "Windows_NT" setlocal
 
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
-if NOT DEFINED JAVA_HOME goto err
+if NOT DEFINED JAVA_HOME goto :err
 
 REM Ensure that any user defined CLASSPATH variables are not used on startup
 set CLASSPATH="%CASSANDRA_HOME%\conf"
diff --git a/bin/sstable2json.bat b/bin/sstable2json.bat
index 45dcd50873..9544e0caab 100644
--- a/bin/sstable2json.bat
+++ b/bin/sstable2json.bat
@@ -20,7 +20,7 @@ if "%OS%" == "Windows_NT" setlocal
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF="%CASSANDRA_HOME%\conf"
 if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableExport
-if NOT DEFINED JAVA_HOME goto err
+if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
diff --git a/bin/sstablekeys.bat b/bin/sstablekeys.bat
index 88b33bc6a0..6a483ba083 100644
--- a/bin/sstablekeys.bat
+++ b/bin/sstablekeys.bat
@@ -20,7 +20,7 @@ if "%OS%" == "Windows_NT" setlocal
 if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
 if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF="%CASSANDRA_HOME%\conf"
 if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableExport
-if NOT DEFINED JAVA_HOME goto err
+if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^