diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index f703dd1beb..7952d106a3 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -942,6 +942,7 @@ def check_os_version
 end
 
   def check_xcode_license_approved
+    return if MacOS::Xcode.bad_xcode_select_path?
     # If the user installs Xcode-only, they have to approve the
     # license or no "xc*" tool will work.
     <<-EOS.undent if `/usr/bin/xcrun clang 2>&1` =~ /license/ and not $?.success?
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 7024affc60..2697e80b87 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -184,7 +184,7 @@ class << ENV
     # nothing is valid, it still fixes most usage to supply a valid path that
     # is not "/".
     if MacOS::Xcode.bad_xcode_select_path?
-      (Xcode.prefix || HOMEBREW_PREFIX).to_s
+      (MacOS::Xcode.prefix || HOMEBREW_PREFIX).to_s
     end
   end