diff --git a/lib/messagebus/mailer.rb b/lib/messagebus/mailer.rb
index ce692cdf2..c6eed9760 100644
--- a/lib/messagebus/mailer.rb
+++ b/lib/messagebus/mailer.rb
@@ -40,11 +40,11 @@ module Messagebus
 
         begin
           @client.add_message(m)
+          status = @client.flush
         rescue Exception => e
           raise "Message bus error with email #{m.inspect}"
         end
       end
-      status = @client.flush
       if status[:failureCount] && status[:failureCount] > 0
         raise "Messagebus failure.  failureCount=#{failureCount}, message=#{message.inspect}"
       end