[ios] Ensure potential variables that might be nil have a fallback.

1 files changed, 4 insertions, 3 deletions

diff --git a/platform/darwin/src/MGLSDKMetricsManager.m b/platform/darwin/src/MGLSDKMetricsManager.m
index ed48eaf0c1..7f89c36b3b 100644
--- a/platform/darwin/src/MGLSDKMetricsManager.m
+++ b/platform/darwin/src/MGLSDKMetricsManager.m
@@ -42,12 +42,13 @@ NSString* MGLStringFromMetricType(MGLMetricType metricType) {
                                 [UIScreen mainScreen].bounds.size.height];
         
         NSLocale *currentLocale = [NSLocale currentLocale];
-        NSString *country = [currentLocale objectForKey:NSLocaleCountryCode];
+        
+        NSString *country = [currentLocale objectForKey:NSLocaleCountryCode] ?: @"unknown";
         
         NSString *device = deviceName();
         
-        const NXArchInfo localArchInfo = *NXGetLocalArchInfo();
-        NSString *abi = [NSString stringWithUTF8String:localArchInfo.description];
+        const NXArchInfo *localArchInfo = NXGetLocalArchInfo();
+        NSString *abi = (localArchInfo != NULL) ? @(localArchInfo->description) : @"unknown";
         
         NSString *ram = [NSString stringWithFormat:@"%llu", [NSProcessInfo processInfo].physicalMemory];