diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index f03db10d3f94140a66d35e3c3dd3e705d4687a90..16340f0efb879c170c914e7e939f03d4d2c35a33 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -27,10 +27,5 @@ else
     echo
 fi
 
-if [ -n "$SCOTCH_ARCH_PATH" ]
-then
-    wmake $targetType scotchGamgAgglomeration
-fi
-
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/wmake/scripts/AllwmakeParseArguments b/wmake/scripts/AllwmakeParseArguments
index 0c8197c7d4c13464af79038ae9cf0a46ad760cbc..cbd5aa01e9bf3b69d1b7bc7bc6cf9fd7c88aeb39 100644
--- a/wmake/scripts/AllwmakeParseArguments
+++ b/wmake/scripts/AllwmakeParseArguments
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -144,6 +144,16 @@ do
 done
 
 
+#------------------------------------------------------------------------------
+# If WM_CONTINUE_ON_ERROR not set activate the shell option "stop on error"
+#------------------------------------------------------------------------------
+
+if [ -z "${WM_CONTINUE_ON_ERROR}" ]
+then
+    set -e
+fi
+
+
 #------------------------------------------------------------------------------
 # Cleanup local variables and functions
 #------------------------------------------------------------------------------