diff --git a/run/disk.sh b/run/disk.sh
index c0e6fe3..6b7fd7b 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables
 
diff --git a/run/install.sh b/run/install.sh
index a5d8514..830680f 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Display wait message on port 5000
 HTML="Please wait while Virtual DSM is installing...<script>\
@@ -47,7 +47,7 @@ if [ "$SUM" != "14fb88cb7cabddb5af1d0269bf032845" ]; then
 fi
 
 set +e
-xz -dc <"$RD" >"$TMP/rd" 2>/dev/null
+xz -dc <"$RD" >"$TMP/rd" 2>/dev/null || true
 (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null)
 set -e
 
diff --git a/run/network.sh b/run/network.sh
index 77856d3..c608315 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables
 
@@ -155,8 +155,8 @@ configureNAT () {
     echo "/etc/resolv.conf:" && echo && cat /etc/resolv.conf && echo
   fi
 
-  mapfile -t nameservers < <(grep '^nameserver' /etc/resolv.conf | sed 's/\t/ /g' | sed 's/nameserver //' | sed 's/ //g')
-  searchdomains=$(grep '^search' /etc/resolv.conf | sed 's/\t/ /g' | sed 's/search //' | sed 's/#.*//' | sed 's/\s*$//g' | sed 's/ /,/g')
+  mapfile -t nameservers < <( { grep '^nameserver' /etc/resolv.conf || true; } | sed 's/\t/ /g' | sed 's/nameserver //' | sed 's/ //g')
+  searchdomains=$( { grep '^search' /etc/resolv.conf || true; } | sed 's/\t/ /g' | sed 's/search //' | sed 's/#.*//' | sed 's/\s*$//g' | sed 's/ /,/g')
   domainname=$(echo "$searchdomains" | awk -F"," '{print $1}')
 
   for nameserver in "${nameservers[@]}"; do
diff --git a/run/power.sh b/run/power.sh
index 87fac55..ba97874 100644
--- a/run/power.sh
+++ b/run/power.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Configure QEMU for graceful shutdown
 
diff --git a/run/run.sh b/run/run.sh
index 777ab08..2d20f12 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables
 
@@ -15,8 +15,7 @@ echo "Starting Virtual DSM for Docker v${VERSION}..."
 STORAGE="/storage"
 KERNEL=$(uname -r | cut -b 1)
 
-trap 'echo >&2 "Error - exited with status $? at line $LINENO:"; 
-         pr -tn $0 | tail -n+$((LINENO - 3)) | head -n7 >&2' ERR
+trap 'echo >&2 "Error status $? for: ${BASH_COMMAND} (line $LINENO/$BASH_LINENO)"' ERR
 
 [ ! -d "$STORAGE" ] && echo "Storage folder (${STORAGE}) not found!" && exit 69
 [ ! -f "/run/run.sh" ] && echo "Script must run inside Docker container!" && exit 60
diff --git a/run/serial.sh b/run/serial.sh
index c03ed61..8766875 100644
--- a/run/serial.sh
+++ b/run/serial.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables