Refactor gateway selector error handling
Merge pull request #947 from Shopify/refactor-gateway-selector-error-handling

Refactor gateway selector error handling