diff --git a/Classification/doc/Classification/PackageDescription.txt b/Classification/doc/Classification/PackageDescription.txt
index 0771dcd89c2..24784495683 100644
--- a/Classification/doc/Classification/PackageDescription.txt
+++ b/Classification/doc/Classification/PackageDescription.txt
@@ -75,7 +75,7 @@ Data structures specialized to classify clusters.
 \cgalPkgDependsOn{\ref PkgSolverInterface, \ref PkgSpatialSearchingD}
 \cgalPkgBib{cgal:lm-clscm-12}
 \cgalPkgLicense{\ref licensesGPL "GPL"}
-\cgalPkgDemo{Operations on Polyhedra,polyhedron_3.zip}
+\cgalPkgDemo{CGAL Lab,CGALlab.zip}
 \cgalPkgShortInfoEnd
 
 \cgalPkgDescriptionEnd
diff --git a/Maintenance/public_release/scripts/precompiled_demos_zips b/Maintenance/public_release/scripts/precompiled_demos_zips
index c1bd6281076..405e0e806b6 100755
--- a/Maintenance/public_release/scripts/precompiled_demos_zips
+++ b/Maintenance/public_release/scripts/precompiled_demos_zips
@@ -76,6 +76,7 @@ pushd Triangulation_on_sphere_2_Demo_with_dlls; zip -r ../triangulation_on_spher
 
 # CGAL-6.0
 pushd Lab_Demo_with_dlls; zip -r ../CGALlab.zip *; popd
+pushd Arrangement_on_surface_2_earth_Demo_with_dlls; zip -r ../arrangements_2_earth.zip *; popd
 
 # check
 echo CHECK now. The following lines should be empty.
diff --git a/Scripts/developer_scripts/tag_pr_per_release.sh b/Scripts/developer_scripts/tag_pr_per_release.sh
index 9ff54e99349..e2206e36798 100644
--- a/Scripts/developer_scripts/tag_pr_per_release.sh
+++ b/Scripts/developer_scripts/tag_pr_per_release.sh
@@ -21,6 +21,12 @@
 
 set -e # Exit the script on first error, for safety
 
+err_report() {
+    echo "Error (code $?) on line $(caller)"
+}
+
+trap 'err_report $LINENO' ERR
+
 PREVIOUS_MAJOR_RELEASE=$1
 CURRENT_RELEASE=$2