diff --git a/src/code/OpenAI.cs b/src/code/OpenAI.cs
index 1b8e11a7..f8b5d6c7 100644
--- a/src/code/OpenAI.cs
+++ b/src/code/OpenAI.cs
@@ -46,14 +46,14 @@ public OpenAI()
             }
 
 
-            if (endpoint.EndsWith(".azure-api.net", StringComparison.Ordinal))
+            if (endpoint.EndsWith(".azure-api.net", StringComparison.Ordinal) || endpoint.EndsWith(".azure-api.net/", StringComparison.Ordinal))
             {
                 AzureKeyCredentialPolicy policy = new AzureKeyCredentialPolicy(new AzureKeyCredential(apiKey), "Ocp-Apim-Subscription-Key");
                 options.AddPolicy(policy, Azure.Core.HttpPipelinePosition.PerRetry);
 
                 client = new OpenAIClient(new Uri(endpoint), new AzureKeyCredential("placeholder"), options);
             }
-            else if (endpoint.EndsWith(".openai.azure.com", StringComparison.Ordinal))
+            else if (endpoint.EndsWith(".openai.azure.com", StringComparison.Ordinal) || endpoint.EndsWith(".openai.azure.com/", StringComparison.Ordinal))
             {
                 client = new OpenAIClient(new Uri(endpoint), new AzureKeyCredential(apiKey));
             }
@@ -205,7 +205,7 @@ internal string GetCompletion(string prompt, bool debug, CancellationToken cance
                 return output;
                 
             }
-            catch (Azure.RequestFailedException e)
+            catch (RequestFailedException e)
             {
                 return $"{PSStyle.Instance.Foreground.BrightRed}HTTP EXCEPTION: {e.Message}";
             }