diff --git a/.travis.yml b/.travis.yml
index 913400c6..d5dbd199 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,10 @@ install:
   - pipenv install
 
 env:
-  - PB_BASE_URL='http://workflow.sartography.com:5001/pb/'
+  global:
+    - COMMIT=${$TRAVIS_COMMIT::8}
+  matrix:
+    - PB_BASE_URL='http://workflow.sartography.com:5001/pb/'
 
 script:
   - pipenv run coverage run -m pytest
diff --git a/deploy.sh b/deploy.sh
index 86845e93..a4a83231 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
 # Build and push Docker image to Docker Hub
-echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin
+echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin || exit 1
 REPO="sartography/cr-connect-workflow"
 TAG=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH" ; fi)
-COMMIT=${$TRAVIS_COMMIT::8}
-docker build -f Dockerfile -t "$REPO:$COMMIT" .
-docker tag "$REPO:$COMMIT" "$REPO:$TAG"
-docker tag "$REPO:$COMMIT" "$REPO:travis-$TRAVIS_BUILD_NUMBER"
-docker push "$REPO"
+docker build -f Dockerfile -t "$REPO:$COMMIT" . || exit 1
+docker tag "$REPO:$COMMIT" "$REPO:$TAG" || exit 1
+docker tag "$REPO:$COMMIT" "$REPO:travis-$TRAVIS_BUILD_NUMBER" || exit 1
+docker push "$REPO" || exit 1
 
 # Wait for Docker Hub
 echo "Publishing to Docker Hub..."
@@ -17,4 +16,4 @@ sleep 30
 # Notify DC/OS that Docker image has been updated
 echo "Refreshing DC/OS..."
 STAGE=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "production"; else echo "$TRAVIS_BRANCH" ; fi)
-aws sqs send-message --region "$AWS_DEFAULT_REGION" --queue-url "$AWS_SQS_URL" --message-body "crconnect/$STAGE/backend"
+aws sqs send-message --region "$AWS_DEFAULT_REGION" --queue-url "$AWS_SQS_URL" --message-body "crconnect/$STAGE/backend" || exit 1