diff --git a/External/UbiquityStoreManager b/External/UbiquityStoreManager
index c02affe8..5e38f25f 160000
--- a/External/UbiquityStoreManager
+++ b/External/UbiquityStoreManager
@@ -1 +1 @@
-Subproject commit c02affe877a6de49bbe4055b8dceed52613f4e12
+Subproject commit 5e38f25f6e058cc52b8e41bcdc183b7966bb3ac7
diff --git a/MasterPassword/ObjC/iOS/MPLogsViewController.m b/MasterPassword/ObjC/iOS/MPLogsViewController.m
index 8136b42e..66829353 100644
--- a/MasterPassword/ObjC/iOS/MPLogsViewController.m
+++ b/MasterPassword/ObjC/iOS/MPLogsViewController.m
@@ -107,8 +107,10 @@
 - (void)switchCloudStore {
 
     NSDictionary *cloudStores = [[MPiOSAppDelegate get].storeManager enumerateCloudStores];
-    if (!cloudStores)
-    wrn(@"Failed enumerating cloud stores.");
+    if (!cloudStores) {
+        wrn( @"Failed enumerating cloud stores." );
+        return;
+    }
 
     NSString *currentStoreUUID = nil;
     NSMutableDictionary *stores = [NSMutableDictionary dictionary];