diff --git a/lib/kamal/cli/build.rb b/lib/kamal/cli/build.rb
index 54d4d6db..3508079f 100644
--- a/lib/kamal/cli/build.rb
+++ b/lib/kamal/cli/build.rb
@@ -43,8 +43,8 @@ class Kamal::Cli::Build < Kamal::Cli::Base
           cli.create
         end
       rescue SSHKit::Command::Failed => e
-        warn "Missing compatible builder, so creating a new one first"
-        if e.message =~ /(context not found|no builder)/
+        if e.message =~ /(context not found|no builder|does not exist)/
+          warn "Missing compatible builder, so creating a new one first"
           cli.create
         else
           raise