Catch potential NPE

Catch case where country detector might return a null country

Bug:11139097
Change-Id: I5d4841a8f8d852e18cff1f9c359d5e005c7e58b8
2 files changed