From 2637587cf758cd172655bc12d8405ed2033653cc Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 19 Apr 2019 15:18:26 -0400
Subject: [PATCH] null checks

---
 src/Core/Services/CipherService.cs     | 4 ++--
 src/Core/Services/CollectionService.cs | 4 ++--
 src/Core/Services/FolderService.cs     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Core/Services/CipherService.cs b/src/Core/Services/CipherService.cs
index 5fd47a95c..cc00abb30 100644
--- a/src/Core/Services/CipherService.cs
+++ b/src/Core/Services/CipherService.cs
@@ -202,9 +202,9 @@ namespace Bit.Core.Services
                 Keys_LocalData);
             var ciphers = await _storageService.GetAsync<Dictionary<string, CipherData>>(
                 string.Format(Keys_CiphersFormat, userId));
-            var response = ciphers.Select(c => new Cipher(c.Value, false,
+            var response = ciphers?.Select(c => new Cipher(c.Value, false,
                 localData?.ContainsKey(c.Key) ?? false ? localData[c.Key] : null));
-            return response.ToList();
+            return response?.ToList() ?? new List<Cipher>();
         }
 
         // TODO: sequentialize?
diff --git a/src/Core/Services/CollectionService.cs b/src/Core/Services/CollectionService.cs
index 226d07f62..4b5c3756f 100644
--- a/src/Core/Services/CollectionService.cs
+++ b/src/Core/Services/CollectionService.cs
@@ -93,8 +93,8 @@ namespace Bit.Core.Services
             var userId = await _userService.GetUserIdAsync();
             var collections = await _storageService.GetAsync<Dictionary<string, CollectionData>>(
                 string.Format(Keys_CollectionsFormat, userId));
-            var response = collections.Select(c => new Collection(c.Value));
-            return response.ToList();
+            var response = collections?.Select(c => new Collection(c.Value));
+            return response?.ToList() ?? new List<Collection>();
         }
 
         // TODO: sequentialize?
diff --git a/src/Core/Services/FolderService.cs b/src/Core/Services/FolderService.cs
index 435c22e40..26b41541c 100644
--- a/src/Core/Services/FolderService.cs
+++ b/src/Core/Services/FolderService.cs
@@ -75,8 +75,8 @@ namespace Bit.Core.Services
             var userId = await _userService.GetUserIdAsync();
             var folders = await _storageService.GetAsync<Dictionary<string, FolderData>>(
                 string.Format(Keys_CiphersFormat, userId));
-            var response = folders.Select(f => new Folder(f.Value));
-            return response.ToList();
+            var response = folders?.Select(f => new Folder(f.Value));
+            return response?.ToList() ?? new List<Folder>();
         }
 
         // TODO: sequentialize?