am d9b90fa2: Don\'t crash in CP2 if country detector is null

* commit 'd9b90fa203d65d962650574662611e5d7425163f':
  Don't crash in CP2 if country detector is null