From e71adbd26d0c1f3f02628fdea4e9327007c2997a Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 7 Feb 2017 21:56:28 -0500
Subject: [PATCH] null checks when error handling

---
 src/App/Repositories/BaseApiRepository.cs | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/App/Repositories/BaseApiRepository.cs b/src/App/Repositories/BaseApiRepository.cs
index c5631fde1..d37751aa7 100644
--- a/src/App/Repositories/BaseApiRepository.cs
+++ b/src/App/Repositories/BaseApiRepository.cs
@@ -191,17 +191,20 @@ namespace Bit.App.Repositories
             var statusCode = (int)response.StatusCode;
             if(statusCode >= 400 && statusCode <= 500)
             {
-                var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-
                 ErrorResponse errorResponseModel = null;
-                var errorResponse = JObject.Parse(responseContent);
-                if(errorResponse["ErrorModel"] != null && errorResponse["ErrorModel"]["Message"] != null)
+
+                var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                if(!string.IsNullOrWhiteSpace(responseContent))
                 {
-                    errorResponseModel = errorResponse["ErrorModel"].ToObject<ErrorResponse>();
-                }
-                else if(errorResponse["Message"] != null)
-                {
-                    errorResponseModel = errorResponse.ToObject<ErrorResponse>();
+                    var errorResponse = JObject.Parse(responseContent);
+                    if(errorResponse["ErrorModel"] != null && errorResponse["ErrorModel"]["Message"] != null)
+                    {
+                        errorResponseModel = errorResponse["ErrorModel"].ToObject<ErrorResponse>();
+                    }
+                    else if(errorResponse["Message"] != null)
+                    {
+                        errorResponseModel = errorResponse.ToObject<ErrorResponse>();
+                    }
                 }
 
                 if(errorResponseModel != null)