diff --git a/build.ps1 b/build.ps1
index 955c593..5e80bec 100644
--- a/build.ps1
+++ b/build.ps1
@@ -89,8 +89,12 @@ Copy-Item "$tempdirectory\Identity\Core.dll" -Destination "$pwd\src\licenseGen"
 Remove-Item "$tempdirectory" -Recurse -Force
 
 # start all user requested instances
-foreach($line in Get-Content "$pwd\.servers\serverlist.txt") {
-	Invoke-Expression "& $line"
+if (Test-Path -Path "$pwd\.servers\serverlist.txt" -PathType Leaf) {
+	foreach($line in Get-Content "$pwd\.servers\serverlist.txt") {
+		if (!($line.StartsWith("#"))) {
+			Invoke-Expression "& $line"
+		}
+	}
 }
 
 # remove our bitBetter image
diff --git a/build.sh b/build.sh
index ed498d8..8775cc4 100755
--- a/build.sh
+++ b/build.sh
@@ -92,10 +92,14 @@ cp -f "$TEMPDIRECTORY/Identity/Core.dll" "$PWD/src/licenseGen"
 rm -rf "$TEMPDIRECTORY"
 
 # start all user requested instances
-sed -i 's/\r$//' "$PWD/.servers/serverlist.txt"
-cat "$PWD/.servers/serverlist.txt" | while read -r LINE; do
-	bash -c "$LINE"
-done
+if [ -f "$PWD/src/bitBetter/cert.cert" ]; then
+	sed -i 's/\r$//' "$PWD/.servers/serverlist.txt"
+	cat "$PWD/.servers/serverlist.txt" | while read -r LINE; do
+		if [[ $LINE == "#*" ]] ;
+			bash -c "$LINE"
+		fi
+	done
+fi
 
 # remove our bitBetter image
 docker image rm bitbetter/bitbetter