diff --git a/contrib/dokku_client.sh b/contrib/dokku_client.sh
index 8a18aa69b..3681697b8 100755
--- a/contrib/dokku_client.sh
+++ b/contrib/dokku_client.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 if [[ ! -z $DOKKU_HOST ]]; then
 	function dokku {