Prevent MultiJson::DecodeError error from bubbling up

lib/twitter/api.rb

@@ -319,8 +319,8 @@ def update_profile_image(image, options={})
     # @example Return the settings for the authenticating user.
     #   Twitter.settings
     def settings(options={})
-      method = options.size.zero? ? :get : :post
-      object_from_response(Twitter::Settings, method, "1/account/settings.json", options)
+      request_method = options.size.zero? ? :get : :post
+      object_from_response(Twitter::Settings, request_method, "1/account/settings.json", options)
     end
 
     # Returns activity about me

lib/twitter/client.rb

@@ -2,6 +2,7 @@
 require 'twitter/api'
 require 'twitter/configurable'
 require 'twitter/error/client_error'
+require 'twitter/error/decode_error'
 require 'twitter/rate_limit'
 require 'simple_oauth'
 require 'uri'
@@ -82,6 +83,8 @@ def request(method, path, params={}, options={})
       response
     rescue Faraday::Error::ClientError
       raise Twitter::Error::ClientError
+    rescue MultiJson::DecodeError
+      raise Twitter::Error::DecodeError
     end
 
     def auth_header(method, uri, params={})

lib/twitter/error/decode_error.rb

@@ -0,0 +1,9 @@
+require 'twitter/error'
+
+module Twitter
+  class Error
+    # Raised when JSON parsing fails
+    class DecodeError < Twitter::Error
+    end
+  end
+end