diff --git a/composer/Makefile b/composer/Makefile
index 213eebf6e..60f022110 100644
--- a/composer/Makefile
+++ b/composer/Makefile
@@ -1,7 +1,4 @@
-
+all: docker
 
 docker:
-	docker build . -t "iptestground/composer:latest"
-
-
-all: docker
\ No newline at end of file
+	docker build -t "iptestground/composer:latest" .
diff --git a/composer/composer.sh b/composer/composer.sh
index a063dfaa6..c3bb07f22 100755
--- a/composer/composer.sh
+++ b/composer/composer.sh
@@ -4,6 +4,18 @@
 # plan manifests from the user's local filesystem into a temporary
 # directory that's bind-mounted into the container.
 
+set -o errexit
+set -o pipefail
+
+set -e
+
+err_report() {
+    echo "Error on line $1"
+}
+
+trap 'err_report $LINENO' ERR
+
+
 image_name="iptestground/composer"
 image_tag="latest"
 image_full_name="$image_name:$image_tag"