diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultDataServiceClient.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultDataServiceClient.cs
index 83b9d13fa132..f9b06d9793b5 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultDataServiceClient.cs
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultDataServiceClient.cs
@@ -192,7 +192,8 @@ public IEnumerable<KeyIdentityItem> GetKeys(KeyVaultObjectFilterOptions options)
                     result = this.keyVaultClient.GetKeysNextAsync(options.NextLink).GetAwaiter().GetResult();
                 
                 options.NextLink = result.NextLink;
-                return result.Value.Select((keyItem) => { return new KeyIdentityItem(keyItem, this.vaultUriHelper); });
+                return (result.Value == null) ? new List<KeyIdentityItem>() :
+                    result.Value.Select((keyItem) => { return new KeyIdentityItem(keyItem, this.vaultUriHelper); });
             }
             catch (Exception ex)
             {
@@ -349,7 +350,8 @@ public IEnumerable<SecretIdentityItem> GetSecrets(KeyVaultObjectFilterOptions op
                     result = this.keyVaultClient.GetSecretsNextAsync(options.NextLink).GetAwaiter().GetResult(); 
 
                 options.NextLink = result.NextLink;
-                return  result.Value.Select((secretItem) => { return new SecretIdentityItem(secretItem, this.vaultUriHelper); });            
+                return (result.Value == null) ? new List<SecretIdentityItem>() :
+                    result.Value.Select((secretItem) => { return new SecretIdentityItem(secretItem, this.vaultUriHelper); });            
             }
             catch (Exception ex)
             {