diff --git a/src/local/butler/deploy.py b/src/local/butler/deploy.py
index 12c89cc386f..ff1875b0103 100644
--- a/src/local/butler/deploy.py
+++ b/src/local/butler/deploy.py
@@ -533,6 +533,9 @@ def execute(args):
   _enforce_tests_pass()
   _enforce_safe_day_to_deploy()
 
+  # Needed for some subsequent steps.
+  common.execute('gcloud auth application-default login')
+
   # Build templates before deployment.
   appengine.build_templates()
 
@@ -570,6 +573,15 @@ def execute(args):
     deploy_k8s = False
     deploy_zips = True
 
+  if deploy_k8s:
+    if not common.has_file_in_path('terraform'):
+      print('terraform not found in PATH.')
+      sys.exit(1)
+
+    if not common.has_file_in_path('kubectl'):
+      print('kubectl not found in PATH.')
+      sys.exit(1)
+
   package_zip_paths = []
   if deploy_zips:
     for platform_name in platforms: