Don't access country object if it's None.
Merge pull request #367 from benkonrath/salesforce-3

Don't access country object if it's None.