diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 88ad89b5a..b7025802d 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -1,131 +1,131 @@
 require 'puppet'
 require 'pp'
 
 Puppet.config.setdefaults(:reporting,
     :tagmap => ["$confdir/tagmail.conf",
         "The mapping between reporting tags and email addresses."],
     :sendmail => [%x{which sendmail 2>/dev/null}.chomp,
         "Where to find the sendmail binary with which to send email."],
     :reportfrom => ["report@" + [Facter["hostname"].value, Facter["domain"].value].join("."),
         "The 'from' email address for the reports."],
     :smtpserver => ["none",
         "The server through which to send email reports."]
 )
 
 require 'net/smtp'
 
 Puppet::Server::Report.newreport(:tagmail) do |report|
     unless FileTest.exists?(Puppet[:tagmap])
         Puppet.notice "Cannot send tagmail report; no tagmap file %s" %
             Puppet[:tagmap]
         return
     end
 
     # Load the config file
     taglists = {}
     File.readlines(Puppet[:tagmap]).each do |line|
         taglist = emails = nil
         case line.chomp
         when /^\s*#/: next
         when /^\s*$/: next
         when /^\s*(.+)\s*:\s*(.+)\s*$/:
             taglist = $1
             emails = $2
         else
             raise ArgumentError, "Invalid tagmail config file"
         end
 
         pos = []
         neg = []
         taglist.split(/\s*,\s*/).each do |tag|
             case tag
             when /^\w+/: pos << tag
             when /^!\w+/: neg << tag.sub("!", '')
             else
                 raise Puppet::Error, "Invalid tag '%s'" % tag
             end
         end
 
         # Now split the emails
         emails = emails.split(/\s*,\s*/)
         taglists[emails] = [pos, neg]
     end
 
     # Now find any appropriately tagged messages.
     reports = {}
     taglists.each do |emails, tags|
         pos, neg = tags
 
         # First find all of the messages matched by our positive tags
         messages = nil
         if pos.include?("all")
             messages = report.logs
         else
             # Find all of the messages that are tagged with any of our
             # tags.
             messages = report.logs.find_all do |log|
                 pos.detect { |tag| log.tagged?(tag) }
             end
         end
 
         # Now go through and remove any messages that match our negative tags
         messages.reject! do |log|
             if neg.detect do |tag| log.tagged?(tag) end
                 true
             end
         end
 
         if messages.empty?
-            Puppet.info "No messages to report for %s" % tag
+            Puppet.info "No messages to report to %s" % emails.join(",")
             next
         else
             reports[emails] = messages.collect { |m| m.to_report }.join("\n")
         end
     end
 
     # Let's fork for the sending of the email, since you never know what might
     # happen.
     fork do
         if Puppet[:smtpserver] != "none"
             begin
                 Net::SMTP.start(Puppet[:smtpserver]) do |smtp|
                     reports.each do |emails, messages|
                         Puppet.info "Sending report to %s" % emails.join(", ")
                         smtp.send_message(messages, Puppet[:reportfrom], *emails)
                     end
                 end
             rescue => detail
                 if Puppet[:debug]
                     puts detail.backtrace
                 end
                 raise Puppet::Error,
                     "Could not send report emails through smtp: %s" % detail
             end
         elsif Puppet[:sendmail] != ""
             begin
                 reports.each do |emails, messages|
                     Puppet.info "Sending report to %s" % emails.join(", ")
                     # We need to open a separate process for every set of email addresses
                     IO.popen(Puppet[:sendmail] + " " + emails.join(" "), "w") do |p|
                         p.puts "From: #{Puppet[:reportfrom]}"
                         p.puts "To: %s" % emails.join(', ')
                         p.puts "Subject: Puppet Report for %s" % report.host
                        p.puts "To: " + emails.join(", ")
 
                         p.puts messages
                     end
                 end
             rescue => detail
                 if Puppet[:debug]
                     puts detail.backtrace
                 end
                 raise Puppet::Error,
                     "Could not send report emails via sendmail: %s" % detail
             end
         else
             raise Puppet::Error, "SMTP server is unset and could not find sendmail"
         end
     end
 end
 
 # $Id$