diff --git a/TransactionProcessing.MerchantPos/Program.cs b/TransactionProcessing.MerchantPos/Program.cs
index ebc3bc0..9b7f87c 100644
--- a/TransactionProcessing.MerchantPos/Program.cs
+++ b/TransactionProcessing.MerchantPos/Program.cs
@@ -59,10 +59,9 @@
 
     builder.Services.RegisterHttpClient<ISecurityServiceClient, SecurityServiceClient>();
     builder.Services.RegisterHttpClient<ITransactionProcessorClient, TransactionProcessorClient>();
-    builder.Services.AddHttpClient();
     builder.Services.AddScoped<IEfRepository, EfRepository>();
-    builder.Services.AddScoped<IApiClient, ApiClient>();
     builder.Services.AddScoped<MerchantRuntime>();
+    builder.Services.AddHttpClient<IApiClient, ApiClient>();
     builder.Services.AddSingleton<IMerchantRuntimeFactory, MerchantRuntimeFactory>();
 
     builder.Services.AddDbContext<MerchantDbContext>((sp, options) =>
diff --git a/TransactionProcessing.MerchantPos/WorkerHost.cs b/TransactionProcessing.MerchantPos/WorkerHost.cs
index 595ec1c..61c9cbb 100644
--- a/TransactionProcessing.MerchantPos/WorkerHost.cs
+++ b/TransactionProcessing.MerchantPos/WorkerHost.cs
@@ -59,11 +59,18 @@ private void SyncMerchantWorkers(CancellationToken hostToken)
                 continue;
             }
 
-            StartMerchantWorker(
-                (settings.ServiceClientId, settings.ServiceClientSecret),
-                (settings.ClientId, settings.ClientSecret),
-                merchant,
-                hostToken);
+            try
+            {
+                StartMerchantWorker(
+                    (settings.ServiceClientId, settings.ServiceClientSecret),
+                    (settings.ClientId, settings.ClientSecret),
+                    merchant,
+                    hostToken);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Failed to start merchant worker for {merchant.MerchantName} ({merchant.MerchantId})", ex);
+            }
         }
     }