diff --git a/iotedgedev/args.py b/iotedgedev/args.py
index a24e2cc..80ce565 100644
--- a/iotedgedev/args.py
+++ b/iotedgedev/args.py
@@ -1,12 +1,13 @@
 import sys
 
-# We had to implement this custom arg parsing class because Click doesn't have a handler to detect command before any arguments are parsed, which we need for the dotenv load command.  We don't want to load dotenv for some commands and we terse output for other commands.
+# We had to implement this custom arg parsing class because Click doesn't have a handler to detect command before any arguments are parsed,
+# which we need for the dotenv load command.  We don't want to load dotenv for some commands and we terse output for other commands.
 
 
 class Args():
     def get_current_command(self):
         if sys.argv and len(sys.argv) > 1 and not self.is_info_command():
-            return sys.argv[1]
+            return ' '.join(sys.argv[1:]).strip()
         else:
             return ''
 
diff --git a/iotedgedev/envvars.py b/iotedgedev/envvars.py
index def4ca2..861acb5 100644
--- a/iotedgedev/envvars.py
+++ b/iotedgedev/envvars.py
@@ -15,13 +15,15 @@ class EnvVars:
     def __init__(self, output):
         self.output = output
         self.loaded = False
-        self.args = Args()
-        self.current_command = self.args.get_current_command()
-        self.terse_commands = ['', 'azure']
-        self.bypass_dotenv_load_commands = ['init', 'e2e']
 
+        current_command = Args().get_current_command()
+        # for some commands we don't want to load dotenv
+        # TODO: temporary hack. A more grace solution would be a decorator on the command to indicate whether to bypass env
+        self.bypass_dotenv_load_commands = ['solution init', 'solution e2e', 'solution create', 'create', 'simulator stop', 'simulator modulecred']
+        self.bypass = self.is_bypass_command(current_command)
         # for some commands we don't want verbose dotenv load output
-        self.verbose = self.current_command not in self.terse_commands
+        self.terse_commands = ['', 'iothub setup']
+        self.verbose = not self.is_terse_command(current_command)
 
     def clean(self):
         """docker-py had py2 issues with shelling out to docker api if unicode characters are in any environment variable. This will convert to utf-8 if py2."""
@@ -40,7 +42,7 @@ class EnvVars:
                     environment[k] = environment[k].encode('utf-8')
 
                 clean_enviro[key] = environment[k]
-        
+
             os.environ = clean_enviro
 
     def backup_dotenv(self):
@@ -86,7 +88,7 @@ class EnvVars:
     def load(self, force=False):
 
         # for some commands we don't want to load dotenv
-        if self.current_command in self.bypass_dotenv_load_commands and not force:
+        if self.bypass and not force:
             return
 
         if not self.loaded or force:
@@ -174,7 +176,6 @@ class EnvVars:
 
         self.loaded = True
 
-
     def __getattribute__(self, name):
         try:
             return object.__getattribute__(self, name)
@@ -248,3 +249,24 @@ class EnvVars:
     def is_posix(self):
         plat = platform.system().lower()
         return plat == "linux" or plat == "darwin"
+
+    def is_bypass_command(self, command):
+        return self.in_command_list(command, self.bypass_dotenv_load_commands)
+
+    def is_terse_command(self, command):
+        return self.in_command_list(command, self.terse_commands)
+
+    def in_command_list(self, command, command_list):
+        for cmd in command_list:
+            if cmd == '':
+                if command == '':
+                    return True
+                else:
+                    continue
+
+            if command.startswith(cmd):
+                if len(command) == len(cmd) or command[len(cmd)] == ' ':
+                    return True
+                else:
+                    continue
+        return False

Add solution create to env check exclude list
(venv) C:\temp>iotedgedev solution create monitortest

=======================================
======== ENVIRONMENT VARIABLES ========
=======================================

.env file not found on disk. Without a file on disk, you must specify all Environment Variables at the system level. (C:\temp\.env)
diff --git a/tests/test_envvars.py b/tests/test_envvars.py
index 12bbfc0..a2a336a 100644
--- a/tests/test_envvars.py
+++ b/tests/test_envvars.py
@@ -1,6 +1,8 @@
 import os
 import sys
+
 import pytest
+
 from iotedgedev.envvars import EnvVars
 from iotedgedev.output import Output
 
@@ -61,10 +63,88 @@ def test_set_envvar():
 def test_envvar_clean():
     output = Output()
     envvars = EnvVars(output)
-    envvar_clean_name = u'IOTEDGEDEV_ENVVAR_CLEAN_TEST'
-    os.environ[envvar_clean_name] = u'test unicode string'
+    envvar_clean_name = u"IOTEDGEDEV_ENVVAR_CLEAN_TEST"
+    os.environ[envvar_clean_name] = u"test unicode string"
 
     envvars.clean()
 
     if not (sys.version_info > (3, 0)):
         assert isinstance(os.environ[envvar_clean_name], str)
+
+
+def test_in_command_list_true_1():
+    output = Output()
+    envvars = EnvVars(output)
+    assert envvars.in_command_list("solution create test_solution", ["init", "e2e", "solution create", "create", "simulator stop"])
+
+
+def test_in_command_list_true_2():
+    output = Output()
+    envvars = EnvVars(output)
+    assert envvars.in_command_list("solution create", ["init", "e2e", "solution create", "create", "simulator stop"])
+
+
+def test_in_command_list_false_1():
+    output = Output()
+    envvars = EnvVars(output)
+    assert not envvars.in_command_list("solution add filtermodule", ["init", "e2e", "solution create", "create", "simulator stop"])
+
+
+def test_in_command_list_false_2():
+    output = Output()
+    envvars = EnvVars(output)
+    assert not envvars.in_command_list("solution addotherstuff filtermodule", ["init", "e2e", "solution add", "create", "simulator stop"])
+
+
+def test_in_command_list_empty_1():
+    output = Output()
+    envvars = EnvVars(output)
+    assert not envvars.in_command_list("", ["init", "e2e", "solution create", "create", "simulator stop"])
+
+
+def test_in_command_list_empty_2():
+    output = Output()
+    envvars = EnvVars(output)
+    assert not envvars.in_command_list("solution create test_solution", ["init", "e2e", "", "create", "simulator stop"])
+
+
+def test_in_command_list_empty_3():
+    output = Output()
+    envvars = EnvVars(output)
+    assert envvars.in_command_list("", ["init", "e2e", "", "create", "simulator stop"])
+
+
+def test_is_bypass_command_true():
+    output = Output()
+    envvars = EnvVars(output)
+    assert envvars.is_bypass_command("solution create EdgeSolution")
+
+
+def test_is_bypass_command_false():
+    output = Output()
+    envvars = EnvVars(output)
+    assert not envvars.is_bypass_command("solution add")
+
+
+def test_is_bypass_command_empty():
+    output = Output()
+    envvars = EnvVars(output)
+    assert not envvars.is_bypass_command("")
+
+
+def test_is_terse_command_true():
+    output = Output()
+    envvars = EnvVars(output)
+    assert envvars.is_terse_command("iothub setup --update-dotenv")
+
+
+def test_is_terse_command_false():
+    output = Output()
+    envvars = EnvVars(output)
+    assert not envvars.is_terse_command("solution create")
+
+
+def test_is_terse_command_empty():
+    output = Output()
+    envvars = EnvVars(output)
+    assert envvars.is_terse_command("")

pip install -e .
parse_log_pytest
requirements.txt
pytest pytest-cov pytest-xdist pytest-mock pytest-asyncio
apt-get update apt-get install -y gcc
3.6
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
adal==1.2.7
applicationinsights==0.11.10
argcomplete==1.12.3
attrs==22.2.0
azure-cli==2.40.0
azure-cli-cloud==2.1.1
azure-cli-command-modules-nspkg==2.0.3
azure-cli-configure==2.0.24
azure-cli-core==2.40.0
azure-cli-extension==0.2.5
azure-cli-iot==0.3.11
azure-cli-nspkg==3.0.4
azure-cli-profile==2.1.5
azure-cli-resource==2.1.16
azure-cli-telemetry==1.0.8
azure-common==1.1.28
azure-core==1.24.2
azure-mgmt-authorization==0.50.0
azure-mgmt-core==1.3.2
azure-mgmt-iothub==0.8.2
azure-mgmt-iothubprovisioningservices==0.2.0
azure-mgmt-managementgroups==0.1.0
azure-mgmt-nspkg==3.0.2
azure-nspkg==3.0.2
bcrypt==4.0.1
certifi==2021.5.30
cffi==1.15.1
charset-normalizer==2.0.12
click==8.0.4
coverage==6.2
cryptography==39.0.2
docker==5.0.3
execnet==1.9.0
fstrings==0.1.0
humanfriendly==10.0
idna==3.10
importlib-metadata==4.8.3
iniconfig==1.1.1
-e git+https://github.com/Azure/iotedgedev.git@79bcd51b6ac99381fa0ab624f88ef173d4bccff9#egg=iotedgedev
isodate==0.6.1
jmespath==0.10.0
knack==0.10.1
msal==1.18.0b1
msal-extensions==1.0.0
msrest==0.7.1
msrestazure==0.6.4.post1
oauthlib==3.2.2
packaging==21.3
paramiko==2.12.0
pkginfo==1.10.0
pluggy==1.0.0
portalocker==2.7.0
psutil==5.9.8
py==1.11.0
pycparser==2.21
Pygments==2.14.0
PyJWT==2.4.0
PyNaCl==1.5.0
pyOpenSSL==23.2.0
pyparsing==3.1.4
PySocks==1.7.1
pytest==7.0.1
pytest-asyncio==0.16.0
pytest-cov==4.0.0
pytest-mock==3.6.1
pytest-xdist==3.0.2
python-dateutil==2.9.0.post0
python-dotenv==0.20.0
PyYAML==6.0.1
requests==2.27.1
requests-oauthlib==2.0.0
six==1.17.0
tabulate==0.8.10
tomli==1.2.3
typing_extensions==4.1.1
urllib3==1.26.20
websocket-client==1.3.1
zipp==3.6.0

name: iotedgedev
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=21.2.2=py36h06a4308_0
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - adal==1.2.7
      - applicationinsights==0.11.10
      - argcomplete==1.12.3
      - attrs==22.2.0
      - azure-cli==2.40.0
      - azure-cli-cloud==2.1.1
      - azure-cli-command-modules-nspkg==2.0.3
      - azure-cli-configure==2.0.24
      - azure-cli-core==2.40.0
      - azure-cli-extension==0.2.5
      - azure-cli-iot==0.3.11
      - azure-cli-nspkg==3.0.4
      - azure-cli-profile==2.1.5
      - azure-cli-resource==2.1.16
      - azure-cli-telemetry==1.0.8
      - azure-common==1.1.28
      - azure-core==1.24.2
      - azure-mgmt-authorization==0.50.0
      - azure-mgmt-core==1.3.2
      - azure-mgmt-iothub==0.8.2
      - azure-mgmt-iothubprovisioningservices==0.2.0
      - azure-mgmt-managementgroups==0.1.0
      - azure-mgmt-nspkg==3.0.2
      - azure-nspkg==3.0.2
      - bcrypt==4.0.1
      - cffi==1.15.1
      - charset-normalizer==2.0.12
      - click==8.0.4
      - coverage==6.2
      - cryptography==39.0.2
      - docker==5.0.3
      - execnet==1.9.0
      - fstrings==0.1.0
      - humanfriendly==10.0
      - idna==3.10
      - importlib-metadata==4.8.3
      - iniconfig==1.1.1
      - isodate==0.6.1
      - jmespath==0.10.0
      - knack==0.10.1
      - msal==1.18.0b1
      - msal-extensions==1.0.0
      - msrest==0.7.1
      - msrestazure==0.6.4.post1
      - oauthlib==3.2.2
      - packaging==21.3
      - paramiko==2.12.0
      - pkginfo==1.10.0
      - pluggy==1.0.0
      - portalocker==2.7.0
      - psutil==5.9.8
      - py==1.11.0
      - pycparser==2.21
      - pygments==2.14.0
      - pyjwt==2.4.0
      - pynacl==1.5.0
      - pyopenssl==23.2.0
      - pyparsing==3.1.4
      - pysocks==1.7.1
      - pytest==7.0.1
      - pytest-asyncio==0.16.0
      - pytest-cov==4.0.0
      - pytest-mock==3.6.1
      - pytest-xdist==3.0.2
      - python-dateutil==2.9.0.post0
      - python-dotenv==0.20.0
      - pyyaml==6.0.1
      - requests==2.27.1
      - requests-oauthlib==2.0.0
      - six==1.17.0
      - tabulate==0.8.10
      - tomli==1.2.3
      - typing-extensions==4.1.1
      - urllib3==1.26.20
      - websocket-client==1.3.1
      - zipp==3.6.0
prefix: /opt/conda/envs/iotedgedev

tests/test_envvars.py::test_in_command_list_true_1 tests/test_envvars.py::test_in_command_list_true_2 tests/test_envvars.py::test_in_command_list_false_1 tests/test_envvars.py::test_in_command_list_false_2 tests/test_envvars.py::test_in_command_list_empty_1 tests/test_envvars.py::test_in_command_list_empty_2 tests/test_envvars.py::test_in_command_list_empty_3 tests/test_envvars.py::test_is_bypass_command_true tests/test_envvars.py::test_is_bypass_command_false tests/test_envvars.py::test_is_bypass_command_empty tests/test_envvars.py::test_is_terse_command_true tests/test_envvars.py::test_is_terse_command_false tests/test_envvars.py::test_is_terse_command_empty
tests/test_envvars.py::test_valid_get_envvar tests/test_envvars.py::test_invalid_get_envvar tests/test_envvars.py::test_valid_load tests/test_envvars.py::test_valid_verify_envvar_has_val tests/test_envvars.py::test_valid_get_envvar_key_if_val tests/test_envvars.py::test_invalid_get_envvar_key_if_val tests/test_envvars.py::test_set_envvar tests/test_envvars.py::test_envvar_clean
iotedgedev/args.py iotedgedev/envvars.py
iotedgedev/args.py iotedgedev/envvars.py