1 files changed, 6 insertions, 6 deletions
diff --git a/lib/mattermost/client.rb b/lib/mattermost/client.rb
index d6759eac0d0..6eaaed34063 100644
--- a/lib/mattermost/client.rb
+++ b/lib/mattermost/client.rb
@@ -29,13 +29,13 @@ module Mattermost
     def json_response(response)
       json_response = JSON.parse(response.body)
 
-      if response.success?
-        json_response
-      elsif json_response['message']
-        raise ClientError(json_response['message'])
-      else
-        raise ClientError('Undefined error')
+      unless response.success?
+        raise ClientError(json_response['message'] || 'Undefined error')
       end
+
+      json_response
+    rescue JSON::JSONError => e
+      raise ClientError('Cannot parse response')
     end
   end
 end