diff --git a/ci.sh b/ci.sh
index 59b4113291..fa7ae5b727 100755
--- a/ci.sh
+++ b/ci.sh
@@ -24,7 +24,7 @@ export PATH=$PATH:$MBOOT_HOME:$M2_HOME/bin:$JAVA_HOME/bin
 
 CMD=$1
 
-[ "$1" = "" ] && echo && echo "You must specify a checkout or update!" && echo && exit
+[ "$1" = "" ] && echo && echo "You must specify a checkout or update!" && echo && exit 1
 
 HOME_DIR=`pwd`
 DATE=`date`
diff --git a/maven-mboot/src/bash/maven.functions b/maven-mboot/src/bash/maven.functions
index 65d433260d..94cfe4901f 100755
--- a/maven-mboot/src/bash/maven.functions
+++ b/maven-mboot/src/bash/maven.functions
@@ -44,7 +44,7 @@ findAndSetMavenRepoLocal()
 {
   if [ -f $HOME/build.properties ]
   then
-    repoLocal=`cat $HOME/build.properties | grep "maven.repo.local" | sed 's/^.*= *//'`
+    repoLocal=`cat $HOME/build.properties | egrep "^maven.repo.local" | sed 's/^.*= *//'`
   else
     repoLocal=$HOME/.maven/repository
   fi
@@ -504,7 +504,7 @@ fi
 if [ ! -x "$JAVACMD" ] ; then
   echo "Error: JAVA_HOME is not defined correctly."
   echo "  We cannot execute $JAVACMD"
-  exit
+  exit 1
 fi
 
 # For Cygwin, switch to Windows format before running java
diff --git a/maven-mboot/src/bash/mboot b/maven-mboot/src/bash/mboot
index 74045ab348..fe4540711a 100755
--- a/maven-mboot/src/bash/mboot
+++ b/maven-mboot/src/bash/mboot
@@ -64,8 +64,8 @@ export MBOOT_HOME=`dirname $0`
 
 . ${MBOOT_HOME}/maven.functions
 
-[ ! -d $dir ] && echo "Specified directory doesn't exist!" && exit
+[ ! -d $dir ] && echo "Specified directory doesn't exist!" && exit 1
 
-[ ! -f $dir/${POM} ] && echo "No ${POM} in specified directory!" && exit
+[ ! -f $dir/${POM} ] && echo "No ${POM} in specified directory!" && exit 1
 
 buildMavenProject $dir $jar $install $pomInstall $leaveBootFiles
diff --git a/maven-mboot/src/bash/modello b/maven-mboot/src/bash/modello
index 16838f56fc..247639a58b 100755
--- a/maven-mboot/src/bash/modello
+++ b/maven-mboot/src/bash/modello
@@ -68,7 +68,7 @@ export MBOOT_HOME=`dirname $0`
 
 . ${MBOOT_HOME}/maven.functions
 
-[ ! -f $model ] && echo "Specified model doesn't exist!" && exit
+[ ! -f $model ] && echo "Specified model doesn't exist!" && exit 1
 
 [ ! -d $dir ] && mkdir -p $dir
 
diff --git a/maven-model/build.sh b/maven-model/build.sh
index 0a5df2d9e6..e11ce37555 100755
--- a/maven-model/build.sh
+++ b/maven-model/build.sh
@@ -4,21 +4,28 @@ rm -rf target
 
 # Generate the sources from the model
 modello --model=maven.mdo --version=4.0.0 --mode=java --dir=target/generated-sources
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
 # Generate the source for the xpp3 marshaller and unmarshaller
 modello --model=maven.mdo --version=4.0.0 --mode=xpp3 --dir=target/generated-sources
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
 # Generate the 3.0.0 source from the model
 modello --model=maven.mdo --version=3.0.0 --mode=java --dir=target/generated-sources --package-with-version
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
 # Generate the 3.0.0 source for the xpp3 marshaller and unmarshaller
 modello --model=maven.mdo --version=3.0.0 --mode=xpp3 --dir=target/generated-sources --package-with-version
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
 # Generate XML Schema
 modello --model=maven.mdo --version=4.0.0 --mode=xsd --dir=.
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
 # Generate XDoc
 modello --model=maven.mdo --version=4.0.0 --mode=xdoc --dir=target/generated-xdocs
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
 # Build the sources
 mboot --install
+ret=$?; if [ $ret != 0 ]; then exit $ret; fi