diff --git a/bashistrano b/bashistrano
index a880245..7a3fe73 100755
--- a/bashistrano
+++ b/bashistrano
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 
 # Bashistrano - A bash deployment automation tool
 
@@ -25,6 +25,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+set -Eeuo pipefail
+
 VERSION='1.1.0'
 
 # --------------------