diff --git a/.env.enc b/.env.enc
index 15d3065..4af7c78 100644
Binary files a/.env.enc and b/.env.enc differ
diff --git a/package.json b/package.json
index 6addd6f..7779af5 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
   },
   "husky": {
     "hooks": {
-      "pre-push": "sh ./scripts/encrypt.sh"
+      "pre-commit": "sh ./scripts/encrypt.sh",
+      "pre-push": "yarn lint && yarn test"
     }
   },
   "repository": {
diff --git a/scripts/encrypt.sh b/scripts/encrypt.sh
index 478f082..a832a25 100644
--- a/scripts/encrypt.sh
+++ b/scripts/encrypt.sh
@@ -1,4 +1,23 @@
 #!/bin/bash
-travis encrypt-file .env --add --force
-git add .env.enc
-git commit -m "TRAVIS: add encrypted key"
+echo "Encrypting .env file for Travis..."
+if hash travis 2>/dev/null; then
+	if [ ! -f .env ]; then
+		echo "============================================================================================"
+		echo "ERROR: You must create a .env file and add your credentials. See .env.example for an example"
+		echo "============================================================================================"
+		exit 3
+	else
+		travis encrypt-file .env --add --force --pro
+		git add .env.enc
+		git add .travis.yml
+		echo ".env.enc created and added to commit"
+	fi
+else
+	echo "============================================================================================"
+	echo "ERROR: Travis CLI is not installed on your local. Please install from:"
+	echo "\thttps://github.com/travis-ci/travis.rb"
+	echo "After installing, make sure that you login with:"
+	echo "\ttravis login --pro"
+	echo "============================================================================================"
+	exit 3
+fi