diff --git a/src/puppet/environments/production/modules/smgr_report/lib/puppet/reports/smgr_report.rb b/src/puppet/environments/production/modules/smgr_report/lib/puppet/reports/smgr_report.rb
index 13a971a2..24d2d523 100644
--- a/src/puppet/environments/production/modules/smgr_report/lib/puppet/reports/smgr_report.rb
+++ b/src/puppet/environments/production/modules/smgr_report/lib/puppet/reports/smgr_report.rb
@@ -38,6 +38,10 @@ def process
         puts "Catalog for server not found."
         return
       end
+      if msg.include? "Caught TERM; calling stop"
+        puts "Puppet agent exited"
+        return
+      end
       log_data += resource + ":" + msg + "\n"
     end
     File.open(destination,"w") do |f|
@@ -48,10 +52,11 @@ def process
       puts "puppet run failed"
       client_fqdn = client.split(".")
       client_hostname = client_fqdn[0]
+      print "log data =" + log_data +"\n"
 
       http = Net::HTTP.new(hostname, 9002)
 
-      response = http.send_request('PUT', '/server_status?server_id=' + hostname + '&state=puppet_failed')
+      response = http.send_request('PUT', '/server_status?server_id=' + client_hostname + '&state=puppet_failed')
       puts "response code is " + response.code
       if response.code != "200"
         puts "Error posting puppet status"