diff --git a/8.0/run.sh b/8.0/run.sh
index ade3963..f11a815 100755
--- a/8.0/run.sh
+++ b/8.0/run.sh
@@ -9,7 +9,16 @@ set -e
 : ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD}
 export PGHOST PGPORT PGUSER PGPASSWORD
 
-[ "$1" != "--" ] && exec "$@"
+case "$1" in
+	--)
+		shift
+		exec /usr/bin/openerp-server "$@"
+		;;
+	-*)
+		exec /usr/bin/openerp-server "$@"
+		;;
+	*)
+		exec "$@"
+esac
 
-shift
-exec /usr/bin/openerp-server "$@"
+exit 1