diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb
index bab7899a98..fd32edb3b5 100644
--- a/Library/Homebrew/cli/named_args.rb
+++ b/Library/Homebrew/cli/named_args.rb
@@ -167,6 +167,8 @@ module Homebrew
           raise TapFormulaOrCaskUnavailableError.new(tap, short_name)
         end
 
+        raise NoSuchKegError, name if resolve_formula(name)
+
         raise FormulaOrCaskUnavailableError, name
       end
       private :load_formula_or_cask
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index c3809b6592..57b97cc416 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -132,7 +132,7 @@ module Homebrew
       system_command! "find", args:         args.named.to_default_kegs.map(&:to_s) + %w[-not -type d -print],
                               print_stdout: true
     else
-      kegs, casks = args.named.to_formulae_to_casks(method: :default_kegs)
+      kegs, casks = args.named.to_kegs_to_casks
 
       kegs.each { |keg| PrettyListing.new keg } if kegs.present?
       list_casks(casks, args: args) if casks.present?