diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index bfca620..e181f10 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -80,7 +80,8 @@ module Spree
                                                   # phone is currently blanked in AM's PPX response lib
                                                   :phone      => @ppx_details.params["phone"] || "(not given)"
 
-          if (state = Spree::State.find_by_abbr(ship_address["state"].upcase))
+          state = Spree::State.find_by_abbr(ship_address["state"].upcase) if ship_address["state"].present?
+          if state
             order_ship_address.state = state
           else
             order_ship_address.state_name = ship_address["state"]