From 8b015ac266ddb655991927ac6a14c454d9e31b1d Mon Sep 17 00:00:00 2001
From: John-Hart <johnhart@microsoft.com>
Date: Thu, 14 Apr 2016 13:05:37 -0700
Subject: [PATCH] Captured the JSONException that may occur on a Non-Success
 StatusCode when attempting to Deserialize the HTTPResponse.Content when it is
 not JSON

---
 .../AzureClientExtensions.cs                          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs
index 57bbd064b95c2..0d8505210fd5e 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs
@@ -599,7 +599,16 @@ private static async Task<AzureOperationResponse<JObject, JObject>> GetRawAsync(
                 statusCode != HttpStatusCode.Created &&
                 statusCode != HttpStatusCode.NoContent)
             {
-                CloudError errorBody = SafeJsonConvert.DeserializeObject<CloudError>(responseContent, client.DeserializationSettings);
+                CloudError errorBody = null;
+                try
+                {
+                    errorBody = SafeJsonConvert.DeserializeObject<CloudError>(responseContent, client.DeserializationSettings);
+                }
+                catch (JsonException)
+                {
+                    // failed to deserialize, return empty body
+                }
+
                 throw new CloudException(string.Format(CultureInfo.InvariantCulture,
                     Resources.LongRunningOperationFailed, statusCode))
                 {