X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=5a156f9dce691be8f5e8d0b2e676bec840f2c7a2;hp=abf46cc9c188da4be8f0326345588d2fddb186da;hb=18ac3d44b843b0f28fa748146eec78da0561f195;hpb=8f4b4a7c4072feee31e3aefb1751d0d104e5d3ba

diff --git a/bin/mailshears b/bin/mailshears
index abf46cc..5a156f9 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -97,7 +97,7 @@ Plugin.includers.each do |plugin_class|
       header += current_time.to_s + "\n"
     end
 
-    header += 'Plugin: ' + plugin_name + "\n"
+    header += 'Plugin: ' + plugin_class.to_s + "\n"
     puts header
     puts '-' * header.size # Underline the header.
 
@@ -116,8 +116,14 @@ Plugin.includers.each do |plugin_class|
       end
 
       leftover_accounts.each do |account|
-        plugin.delete_account(account)
-        puts "Removed: #{account} (#{plugin.describe_account(account)})"
+        begin
+          plugin.delete_account(account)
+          puts "Removed: #{account} (#{plugin.describe_account(account)})"
+        rescue NonexistentAccountError => e
+          # This usually happens after an account's domain is deleted.
+          # When we try to delete the account, it's already gone.
+          puts "Gone: #{account} (#{plugin.describe_account(account)})"
+        end
       end
     end