Handle invalid JSON from server

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/bitbucket_server/connection.rb b/lib/bitbucket_server/connection.rb
index 2d438ae8ca1..ee0888eeecf 100644
--- a/lib/bitbucket_server/connection.rb
+++ b/lib/bitbucket_server/connection.rb
@@ -59,16 +59,17 @@ module BitbucketServer
     private
 
     def check_errors!(response)
-      return if response.code >= 200 && response.code < 300
+      raise ConnectionError, "Response is not valid JSON" unless response.parsed_response.is_a?(Hash)
 
-      details =
-        if response.parsed_response && response.parsed_response.is_a?(Hash)
-          sanitize(response.parsed_response.dig('errors', 0, 'message'))
-        end
+      return if response.code >= 200 && response.code < 300
 
+      details = sanitize(response.parsed_response.dig('errors', 0, 'message'))
       message = "Error #{response.code}"
-      message += ": #{details}" if details
+      message += ": #{details}"
+
       raise ConnectionError, message
+    rescue JSON::ParserError
+      raise ConnectionError, "Unable to parse the server response as JSON"
     end
 
     def auth