diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index 78228421..52baa2c7 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -e
 echo
 echo "configuring settings common among OSes"
 sudo true
diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system
index 9461ce76..94637fec 100755
--- a/ubuntu/configure_fresh_system
+++ b/ubuntu/configure_fresh_system
@@ -5,5 +5,5 @@ sudo apt-get install -y meld whois zsh tmux vim atop aria2 curl pv pixz gajim to
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
-$DIR/common/configure_fresh_system
+DIR="$DIR" $DIR/common/configure_fresh_system