diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 5c3433cbd8..d00b628198 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -800,7 +800,7 @@ class CoreTap < Tap
     # Tests override homebrew-core locations and we don't want to auto-tap in them.
     return if ENV["HOMEBREW_TESTS"]
 
-    safe_system HOMEBREW_BREW_FILE, "tap", instance.name
+    instance.install
   end
 
   def remote
diff --git a/Library/Homebrew/utils/tty.rb b/Library/Homebrew/utils/tty.rb
index ddb7da3824..53c402319f 100644
--- a/Library/Homebrew/utils/tty.rb
+++ b/Library/Homebrew/utils/tty.rb
@@ -87,7 +87,7 @@ module Tty
     CODES.each do |name, code|
       define_method(name) do
         @escape_sequence ||= []
-        @escape_sequence << code
+        @escape_sequence << code if @escape_sequence
         self
       end
     end