diff --git a/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py b/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py
index cc3f278de65..4ef15a5ee2d 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py
+++ b/src/azure-cli/azure/cli/command_modules/storage/_client_factory.py
@@ -196,7 +196,6 @@ def get_account_url(cli_ctx, account_name, service):
 
 
 def cf_blob_service(cli_ctx, kwargs):
-    from knack.util import CLIError
     client_kwargs = _prepare_client_kwargs_track2(cli_ctx)
     t_blob_service = get_sdk(cli_ctx, ResourceType.DATA_STORAGE_BLOB,
                              '_blob_service_client#BlobServiceClient')
@@ -219,10 +218,7 @@ def cf_blob_service(cli_ctx, kwargs):
     account_url = get_account_url(cli_ctx, account_name=account_name, service='blob')
     credential = account_key or sas_token or token_credential
 
-    if account_url and credential:
-        return t_blob_service(account_url=account_url, credential=credential, **client_kwargs)
-    raise CLIError("Please provide valid connection string, or account name with account key, "
-                   "sas token or login auth mode.")
+    return t_blob_service(account_url=account_url, credential=credential, **client_kwargs)
 
 
 def cf_blob_client(cli_ctx, kwargs):
@@ -258,9 +254,7 @@ def cf_adls_service(cli_ctx, kwargs):
     account_url = get_account_url(cli_ctx, account_name=account_name, service='dfs')
     credential = account_key or sas_token or token_credential
 
-    if account_url and credential:
-        return t_adls_service(account_url=account_url, credential=credential, **client_kwargs)
-    return None
+    return t_adls_service(account_url=account_url, credential=credential, **client_kwargs)
 
 
 def cf_adls_file_system(cli_ctx, kwargs):
@@ -281,7 +275,6 @@ def cf_or_policy(cli_ctx, _):
 
 
 def cf_queue_service(cli_ctx, kwargs):
-    from knack.util import CLIError
     client_kwargs = _prepare_client_kwargs_track2(cli_ctx)
     t_queue_service = get_sdk(cli_ctx, ResourceType.DATA_STORAGE_QUEUE, '_queue_service_client#QueueServiceClient')
     connection_string = kwargs.pop('connection_string', None)
@@ -296,10 +289,7 @@ def cf_queue_service(cli_ctx, kwargs):
     account_url = get_account_url(cli_ctx, account_name=account_name, service='queue')
     credential = account_key or sas_token or token_credential
 
-    if account_url and credential:
-        return t_queue_service(account_url=account_url, credential=credential, **client_kwargs)
-    raise CLIError("Please provide valid connection string, or account name with account key, "
-                   "sas token or login auth mode.")
+    return t_queue_service(account_url=account_url, credential=credential, **client_kwargs)
 
 
 def cf_queue_client(cli_ctx, kwargs):
diff --git a/src/azure-cli/azure/cli/command_modules/storage/_validators.py b/src/azure-cli/azure/cli/command_modules/storage/_validators.py
index 4b5b76a2f9b..b2c5d1492a9 100644
--- a/src/azure-cli/azure/cli/command_modules/storage/_validators.py
+++ b/src/azure-cli/azure/cli/command_modules/storage/_validators.py
@@ -182,7 +182,10 @@ def validate_client_parameters(cmd, namespace):
                        'https://docs.microsoft.com/en-us/azure/storage/common/storage-auth-aad-rbac-cli. \n'
                        'Setting the corresponding environment variables can avoid inputting credentials in '
                        'your command. Please use --help to get more information.')
-        n.account_key = _query_account_key(cmd.cli_ctx, n.account_name)
+        try:
+            n.account_key = _query_account_key(cmd.cli_ctx, n.account_name)
+        except Exception:  # pylint: disable=broad-except
+            pass
 
 
 def validate_encryption_key(cmd, namespace):