diff --git a/gui/vlc.watch.py b/gui/vlc.watch.py
index 8761c0190..712d5673a 100644
--- a/gui/vlc.watch.py
+++ b/gui/vlc.watch.py
@@ -3,6 +3,8 @@
 import re
 from datetime import datetime
 
+skipped_versions = ['3.0.11.1']
+
 data = request.urlopen('https://get.videolan.org/vlc/').read().decode('utf-8')
 matches = re.findall(r'/">([0-9\.]+)/</a>\s+(..-...-....)', data)
-releases = [{'version': match[0], 'released': datetime.strftime(datetime.strptime(match[1], '%d-%b-%Y'), '%Y-%m-%d')} for match in matches if match[0].startswith('3.')]
+releases = [{'version': match[0], 'released': datetime.strftime(datetime.strptime(match[1], '%d-%b-%Y'), '%Y-%m-%d')} for match in matches if match[0].startswith('3.') and match[0] not in skipped_versions]
diff --git a/lib/gcc-libs.watch.py b/lib/gcc-libs.watch.py
index c6d8d10f4..68f699b1d 100644
--- a/lib/gcc-libs.watch.py
+++ b/lib/gcc-libs.watch.py
@@ -1,4 +1,4 @@
-#os=Linux
+#os=MinGW
 """
     gcc-libs 0watch script for packages from the mingw64 project
 
diff --git a/lib/gmp.watch.py b/lib/gmp.watch.py
index 49586f931..728a17089 100644
--- a/lib/gmp.watch.py
+++ b/lib/gmp.watch.py
@@ -1,4 +1,4 @@
-#os=Linux
+#os=MinGW
 """
      gmp 0watch script for packages from the mingw64 project
 
diff --git a/lib/gnumpc.watch.py b/lib/gnumpc.watch.py
index 3f5f82ca2..3130ea126 100644
--- a/lib/gnumpc.watch.py
+++ b/lib/gnumpc.watch.py
@@ -1,4 +1,4 @@
-#os=Linux
+#os=MinGW
 """
      gnumpc 0watch script for packages from the mingw64 project
 
diff --git a/lib/libwinpthread.watch.py b/lib/libwinpthread.watch.py
index df0a55e45..747b500f1 100644
--- a/lib/libwinpthread.watch.py
+++ b/lib/libwinpthread.watch.py
@@ -1,4 +1,4 @@
-#os=Linux
+#os=MinGW
 """
     libwinpthread 0watch script for mingw64 projects libwinpthread feed
 """
diff --git a/lib/mpfr4.watch.py b/lib/mpfr4.watch.py
index 3573e9061..be4e87d06 100644
--- a/lib/mpfr4.watch.py
+++ b/lib/mpfr4.watch.py
@@ -1,4 +1,4 @@
-#os=Linux
+#os=MinGW
 """
     mpfr v4 0watch script for packages from the mingw64 project
 """
diff --git a/lib/png16-0.watch.py b/lib/png16-0.watch.py
index d9a13a6ea..6ffe6d9f9 100644
--- a/lib/png16-0.watch.py
+++ b/lib/png16-0.watch.py
@@ -1,4 +1,4 @@
-#os=Linux
+#os=MinGW
 """
     libpng v1.6 0watch script for packages from the mingw64 project
 """
diff --git a/lib/zlib.watch.py b/lib/zlib.watch.py
index d99b733fc..f4e029bc6 100644
--- a/lib/zlib.watch.py
+++ b/lib/zlib.watch.py
@@ -1,4 +1,4 @@
-#os=Linux
+#os=MinGW
 """
     zlib 0watch script for packages from the mingw64 project
 """
diff --git a/watch.ps1 b/watch.ps1
index a10a5bbb2..ac3066da2 100644
--- a/watch.ps1
+++ b/watch.ps1
@@ -1,3 +1,4 @@
+$ErrorActionPreference = "Stop"
 pushd $PSScriptRoot
 
 if (-not (Test-Path "..\incoming" -PathType Container)) {
@@ -9,8 +10,10 @@ foreach ($file in (ls -Recurse -Filter *.watch.py).FullName) {
     $header = Get-Content $file -TotalCount 1
     if (($header -eq "#os=Windows") -or (-not $header.StartsWith("#os="))) {
         echo $file
+        $ErrorActionPreference = "Continue"
         #.\0install.ps1 run --batch https://apps.0install.net/0install/0watch.xml --output ..\incoming $file
         .\0install.ps1 run --batch 0watch-windows.xml.selections --output ..\incoming $file
+        if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
     }
 }
 
diff --git a/watch.sh b/watch.sh
index 873372414..191cfca23 100755
--- a/watch.sh
+++ b/watch.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 cd `dirname $0`
 
 if [ ! -d "../incoming" ]; then