diff --git a/run-app.sh b/run-app.sh
index afa219114..890f8f36f 100755
--- a/run-app.sh
+++ b/run-app.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
+set -e
 set -x
 
 MOZIOT_HOME="${MOZIOT_HOME:=${HOME}/.mozilla-iot}"
+args=""
 
 is_docker_container() {
   if [ -f /.dockerenv ]; then
@@ -14,8 +16,8 @@ is_docker_container() {
 
   return 1
 }
-
 if ! is_docker_container; then
+  args="$args --check-wifi"
   if [ ! -f .post_upgrade_complete ]; then
     ./tools/post-upgrade.sh
   fi
@@ -23,18 +25,18 @@ fi
 
 run_app() {
   export NVM_DIR="$HOME/.nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+  [ ! -s "$NVM_DIR/nvm.sh" ] || \. "$NVM_DIR/nvm.sh"  # This loads nvm
 
   sudo /sbin/ldconfig
 
   echo "nvm version"
-  nvm --version
+  nvm --version || echo "Use system's node insead of nvm"
   echo "node version"
   node --version
   echo "npm version"
   npm --version
   echo "Starting gateway ..."
-  npm start -- --check-wifi
+  npm start -- $args
 }
 
 mkdir -p "${MOZIOT_HOME}/log"