diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results
index 3424eabc641..ba09b59b185 100755
--- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results
+++ b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results
@@ -23,4 +23,4 @@ if ! [ -e "./$to" ]; then
   exit 1
 fi
 
-for f in ${from}/results*txt; do diff -U0 ${1+"$@"} $f ${f/$from/$to}; done |& less
+for f in ${from}/results*txt; do diff -U0 ${1+"$@"} $f ${f/$from/$to}; done |& less -p '^\+[^\+].* [^y]|CGAL-.*|diff'
diff --git a/Maintenance/public_release/scripts/prepare_release b/Maintenance/public_release/scripts/prepare_release
index afdb3f59ee3..2e3f23db0f0 100755
--- a/Maintenance/public_release/scripts/prepare_release
+++ b/Maintenance/public_release/scripts/prepare_release
@@ -1,5 +1,6 @@
 #!/bin/zsh
 
+set -e
 setopt -o glob
 setopt -o extended_glob