diff --git a/bin/steps/mercurial b/bin/steps/mercurial
index 0eaba33101d7365781fa5a474ec0d79519eb1123..9faa0d0718e7b107ed363909d8fd56da208d2c5f 100755
--- a/bin/steps/mercurial
+++ b/bin/steps/mercurial
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 # Install Mercurial if it appears to be required.
-if (grep -Fiq "hg+" requirements.txt) then
-    /app/.heroku/python/bin/pip install  mercurial | cleanup | indent
+if [[ -f "requirements.txt" ]]; then
+	if (grep -Fiq "hg+" requirements.txt) then
+		/app/.heroku/python/bin/pip install  mercurial | cleanup | indent
+	fi
 fi
+
diff --git a/vendor/pip-pop/pip-grep b/vendor/pip-pop/pip-grep
index 59e51904d384509610e623b61ae6fc232e56ceaf..d55000ad8d9f0a919ab2900ceb01fb439b2a243c 100755
--- a/vendor/pip-pop/pip-grep
+++ b/vendor/pip-pop/pip-grep
@@ -8,6 +8,7 @@ Options:
   -h --help     Show this screen.
 """
 import os
+import sys
 from docopt import docopt
 from pip.req import parse_requirements
 from pip.index import PackageFinder
@@ -73,5 +74,5 @@ if __name__ == '__main__':
     try:
         main()
     except Exception:
-        pass
+        sys.exit(1)