diff --git a/.travis.yml b/.travis.yml
index 18e5169..627824c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.3
+  - 2.3.3
+  - 2.4.1
 before_install:
   - cp ./spec/config.yml.example ./spec/config.yml
 script: bundle exec rspec
diff --git a/lib/address_validator/address.rb b/lib/address_validator/address.rb
index 27b8b8d..8602d89 100644
--- a/lib/address_validator/address.rb
+++ b/lib/address_validator/address.rb
@@ -40,17 +40,17 @@ def from_xml(attrs = {})
 
     attr_accessor :name, :street1, :street2, :street3, :city, :state, :zip, :zip_extended, :country, :classification
 
-    def initialize(name: nil, street1: nil, street2: nil, street3: nil, city: nil, state: nil, zip: nil, zip_extended: nil, country: nil, classification: nil)
-      @name = name
-      @street1 = street1
-      @street2 = street2
-      @street3 = street3
-      @city = city
-      @state = state
-      @zip = zip
-      @zip_extended = zip_extended
-      @country = country
-      @classification = (classification || CLASSIFICATION_UNKNOWN).to_i
+    def initialize(params)
+      @name = params[:name]
+      @street1 = params[:street1]
+      @street2 = params[:street2]
+      @street3 = params[:street3]
+      @city = params[:city]
+      @state = params[:state]
+      @zip = params[:zip]
+      @zip_extended = params[:zip_extended]
+      @country = params[:country]
+      @classification = (params[:classification] || CLASSIFICATION_UNKNOWN).to_i
     end
 
     def residential?
diff --git a/lib/address_validator/response.rb b/lib/address_validator/response.rb
index f3b36dd..858c254 100644
--- a/lib/address_validator/response.rb
+++ b/lib/address_validator/response.rb
@@ -46,6 +46,8 @@ def addresses
       else
         addresses = [ AddressValidator::Address.from_xml(response['AddressKeyFormat']) ]
       end
+    rescue
+      []
     end
 
     def address