Small update for merchants that are using custom extensions that may not...

... have had a shipping address set