diff --git a/lib/tdl/queue/abstractions/response/fatal_error_response.rb b/lib/tdl/queue/abstractions/response/fatal_error_response.rb
index 0dceddb..3fdca71 100644
--- a/lib/tdl/queue/abstractions/response/fatal_error_response.rb
+++ b/lib/tdl/queue/abstractions/response/fatal_error_response.rb
@@ -2,11 +2,11 @@ module TDL
   class FatalErrorResponse
 
     def initialize(message)
-      @message = message
+      @message = message + ", (NOT PUBLISHED)"
     end
 
     def audit_text
-      "error = #{@message}, (NOT PUBLISHED)"
+      "error = #{@message}"
     end
   end
 end
diff --git a/lib/tdl/queue/queue_based_implementation_runner.rb b/lib/tdl/queue/queue_based_implementation_runner.rb
index 03a31a4..6e88927 100644
--- a/lib/tdl/queue/queue_based_implementation_runner.rb
+++ b/lib/tdl/queue/queue_based_implementation_runner.rb
@@ -63,11 +63,18 @@ def process_next_request_from(remote_broker, request)
 
               # Act
               if response.instance_of? FatalErrorResponse
-                 remote_broker.close
-                 @audit.end_line
+                 # Do nothing
               else
                  remote_broker.respond_to(request, response)
               end
+
+              @audit.end_line
+
+              if response.instance_of? FatalErrorResponse
+                 remote_broker.close
+              else
+                 # Do nothing
+              end
             end
         end
     end