diff --git a/src/Messaging/API/ConnectionErrorArgs.cs b/src/Messaging/API/ConnectionErrorArgs.cs
index a867a56..2ccbe02 100644
--- a/src/Messaging/API/ConnectionErrorArgs.cs
+++ b/src/Messaging/API/ConnectionErrorArgs.cs
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-using RabbitMQ.Client;
 
 namespace Monai.Deploy.Messaging.API
 {
@@ -22,8 +21,9 @@ namespace Monai.Deploy.Messaging.API
 
     public class ConnectionErrorArgs
     {
-        public ConnectionErrorArgs(ShutdownEventArgs eventArgs) => ShutdownEventArguments = eventArgs ?? throw new ArgumentNullException(nameof(eventArgs));
+        public ConnectionErrorArgs() => ErrorMessage = string.Empty;
+        public ConnectionErrorArgs(string errorMessage) => ErrorMessage = errorMessage;
 
-        public ShutdownEventArgs ShutdownEventArguments { get; }
+        public string ErrorMessage { get; }
     }
 }
diff --git a/src/Messaging/Events/ExportCompleteEvent.cs b/src/Messaging/Events/ExportCompleteEvent.cs
index 1af942e..fe0d2e7 100644
--- a/src/Messaging/Events/ExportCompleteEvent.cs
+++ b/src/Messaging/Events/ExportCompleteEvent.cs
@@ -66,9 +66,9 @@ public ExportCompleteEvent()
 
         public ExportCompleteEvent(ExportRequestEvent exportRequest, ExportStatus exportStatus, Dictionary<string, FileExportStatus> fileStatuses)
         {
-            Guard.Against.Null(exportRequest, nameof(exportRequest));
-            Guard.Against.Null(exportStatus, nameof(exportStatus));
-            Guard.Against.Null(fileStatuses, nameof(fileStatuses));
+            Guard.Against.Null(exportRequest);
+            Guard.Against.Null(exportStatus);
+            Guard.Against.Null(fileStatuses);
 
             WorkflowInstanceId = exportRequest.WorkflowInstanceId;
             ExportTaskId = exportRequest.ExportTaskId;
diff --git a/src/Messaging/Monai.Deploy.Messaging.csproj b/src/Messaging/Monai.Deploy.Messaging.csproj
index b64238a..3a04b76 100644
--- a/src/Messaging/Monai.Deploy.Messaging.csproj
+++ b/src/Messaging/Monai.Deploy.Messaging.csproj
@@ -79,7 +79,6 @@
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.10" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
   </ItemGroup>
diff --git a/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj b/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj
index 8ef5240..85fa9c6 100644
--- a/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj
+++ b/src/Plugins/RabbitMQ/Monai.Deploy.Messaging.RabbitMQ.csproj
@@ -64,6 +64,7 @@
   
   <ItemGroup>
     <PackageReference Include="Polly" Version="7.2.3" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
     <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
   </ItemGroup>
   
diff --git a/src/Plugins/RabbitMQ/Publisher/RabbitMqMessagePublisherService.cs b/src/Plugins/RabbitMQ/Publisher/RabbitMqMessagePublisherService.cs
index 88b6172..e0b25eb 100644
--- a/src/Plugins/RabbitMQ/Publisher/RabbitMqMessagePublisherService.cs
+++ b/src/Plugins/RabbitMQ/Publisher/RabbitMqMessagePublisherService.cs
@@ -48,7 +48,7 @@ public RabbitMQMessagePublisherService(IOptions<MessageBrokerServiceConfiguratio
                                                ILogger<RabbitMQMessagePublisherService> logger,
                                                IRabbitMQConnectionFactory rabbitMqConnectionFactory)
         {
-            Guard.Against.Null(options, nameof(options));
+            Guard.Against.Null(options);
 
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _rabbitMqConnectionFactory = rabbitMqConnectionFactory ?? throw new ArgumentNullException(nameof(rabbitMqConnectionFactory));
@@ -82,7 +82,7 @@ public RabbitMQMessagePublisherService(IOptions<MessageBrokerServiceConfiguratio
 
         internal static void ValidateConfiguration(Dictionary<string, string> configuration)
         {
-            Guard.Against.Null(configuration, nameof(configuration));
+            Guard.Against.Null(configuration);
 
             foreach (var key in ConfigurationKeys.PublisherRequiredKeys)
             {
@@ -95,8 +95,8 @@ internal static void ValidateConfiguration(Dictionary<string, string> configurat
 
         public Task Publish(string topic, Message message)
         {
-            Guard.Against.NullOrWhiteSpace(topic, nameof(topic));
-            Guard.Against.Null(message, nameof(message));
+            Guard.Against.NullOrWhiteSpace(topic);
+            Guard.Against.Null(message);
 
             using var loggingScope = _logger.BeginScope(new Dictionary<string, object>
             {
diff --git a/src/Plugins/RabbitMQ/Subscriber/RabbitMqMessageSubscriberService.cs b/src/Plugins/RabbitMQ/Subscriber/RabbitMqMessageSubscriberService.cs
index bfc4c36..edeff92 100644
--- a/src/Plugins/RabbitMQ/Subscriber/RabbitMqMessageSubscriberService.cs
+++ b/src/Plugins/RabbitMQ/Subscriber/RabbitMqMessageSubscriberService.cs
@@ -131,7 +131,7 @@ private void Channel_ModelShutdown(object? sender, ShutdownEventArgs e)
                 if (OnConnectionError is not null)
                 {
                     _logger.NotifyModelShutdown(e.ToString());
-                    OnConnectionError(sender, new ConnectionErrorArgs(e));
+                    OnConnectionError(sender, new ConnectionErrorArgs(e.ToString()));
                 }
             }
             else