diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo
index 79ca24ae4..65b5ad488 100755
--- a/scripts/remove-incomplete-mo
+++ b/scripts/remove-incomplete-mo
@@ -3,11 +3,17 @@
 # Removes mo files for incomplete translations
 #
 
+set -e
+
 #
 # How many percent needs to be translated
 #
 THRESHOLD=50
 
+if [ ! -z "$1" ] ; then
+    THRESHOLD=$1
+fi
+
 check() {
     lang=`echo $1 | sed 's@po/\(.*\)\.po@\1@'`
     STATS=`LANG=C  msgfmt --statistics -o /dev/null $1 2>&1`
@@ -26,7 +32,7 @@ check() {
     else
         UNTRANSLATED=0
     fi
-    PERCENT=`expr 100 \* $TRANSLATED / \( $TRANSLATED + $FUZZY + $UNTRANSLATED \)`
+    PERCENT=`expr 100 \* $TRANSLATED / \( $TRANSLATED + $FUZZY + $UNTRANSLATED \) || true`
 
     if [ $PERCENT -lt $THRESHOLD ] ; then
         echo "Removing $lang, only $PERCENT%"
@@ -34,11 +40,6 @@ check() {
     fi
 }
 
-if [ ! -z "$1" ] ; then
-    check po/$1.po
-    exit 0
-fi
-
 for x in po/*.po  ; do 
     check $x
 done