fix more tests

src/Runner.Listener/BrokerMessageListener.cs

@@ -52,6 +52,11 @@ public async Task<Boolean> CreateSessionAsync(CancellationToken token)
             var serverUrl = _settings.ServerUrlV2;
             Trace.Info(_settings);
 
+            if (string.IsNullOrEmpty(_settings.ServerUrlV2))
+            {
+                throw new InvalidOperationException("ServerUrlV2 is not set");
+            }
+
             // Create connection.
             Trace.Info("Loading Credentials");
             var credMgr = HostContext.GetService<ICredentialManager>();
@@ -380,6 +385,12 @@ ex is AccessDeniedException ||
                 Trace.Info($"Non-retriable exception: {ex.Message}");
                 return false;
             }
+
+            else if (ex is InvalidOperationException)
+            {
+                Trace.Info($"Non-retriable exception: {ex.Message}");
+                return false;
+            }
             else
             {
                 Trace.Info($"Retriable exception: {ex.Message}");
@@ -392,7 +403,7 @@ private async Task RefreshBrokerConnection()
             var configManager = HostContext.GetService<IConfigurationManager>();
             _settings = configManager.LoadSettings();
 
-            if (_settings.ServerUrlV2 == null)
+            if (string.IsNullOrEmpty(_settings.ServerUrlV2))
             {
                 throw new InvalidOperationException("ServerUrlV2 is not set");
             }

src/Test/L0/Listener/BrokerMessageListenerL0.cs

@@ -22,7 +22,7 @@ public sealed class BrokerMessageListenerL0
 
         public BrokerMessageListenerL0()
         {
-            _settings = new RunnerSettings { AgentId = 1, AgentName = "myagent", PoolId = 123, PoolName = "default", ServerUrl = "http://myserver", WorkFolder = "_work" };
+            _settings = new RunnerSettings { AgentId = 1, AgentName = "myagent", PoolId = 123, PoolName = "default", ServerUrl = "http://myserver", WorkFolder = "_work", ServerUrlV2 = "http://myserverv2" };
             _config = new Mock<IConfigurationManager>();
             _config.Setup(x => x.LoadSettings()).Returns(_settings);
             _credMgr = new Mock<ICredentialManager>();